Adhere to pep8 guidelines
Minor script cleanups