I started using the pyflakes.vim plugin and it automagically shows a
bunch of problems/uncleanliness in the code. It helped me pull this out
in 15mins.
This change shouldn't have any impact on performance or functionality
but it makes the code cleaner.