Don't use class variables
Avoid using {} for multi-line blocks
Spaces missing after comma
Finish the last few stylistic fixes