Cleaned up spacing

I shifted this to being optional so this could be more flexible.  I put
the comment in the wrong place