Style cleanup
Starting to like this 3x3 look...