Fixed formatting / name conventions to be consistent with advice in Code Like a Pythonista, because why not.