Cleaning up styles a bit

Believe it or not, there is some organization in that mess!

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>