Code cleanup

Syntax cleanup, because I'm special like that. Killing some time while
downloading eclipse, also reading through the code while I'm at it.