Attempted to address Manager changes, as well as a few PEP8. Committing so I can checkout to another branch