PEP8 Cleanup
More cleanup, converted dict() methods to {}