Minor cleanup - spacing and such.