cleared pep8 errors
Merge "cleared pep8 errors"