Fix indentation and other pep8 issues