PEP8 cleanup
Merging changes from dev branch