comments and pep8 changes
remove unneccasary if