Code clean-up

Spaces, braces, and more, oh my!