Updating code style to my liking.

Not finished yet, this entire project is large and really needs to be
cleaned up.