ticket:1 Cleaned up(pep8)