PEP8 and Indent fixes