refactor/clean up to meet PEP 8 specs