Clean up script a little bit
Apply PEP8 formatting