Style changes

I hope this is okay, I tried to figure out a consistent style from the existing code.
If you'd like me to change any of this, I'm certainly open to suggestions.