Fix up some spacing issues

Also, add brackets to some single line ifs.  I'm anal
retentive.