PEP8 Fixes, code cleanup

Initial code cleanup work, PEP8 Fixes