Refactored some things to make the names and style conventions match those
specified in PEP-8, and whatever pylint decides is wrong.