I threw PyLint at the code. Then I cleaned everything up.

This blog entry is really just to test the fixes to make sure everything works. Seems fine.