Preparing for PyCharm
Refactoring a bad case of camelCase