Fixed some crazy spacing caused by uncrustify. I need to find a config that I like.