Style changes
Cleaning up
AHHH