Style changes
pep8 and lint