Formatted according to pep8
Merged formatting to pep8