Cleanup: make it Pythonic
Oops, missed return statement in 4fb938a
Cleanup: removed dead code
Cleanup: added blank line