Just need a little cleanup before posting