Format Clean Up

I like pretty code!