Make style changes to follow PEP-8 closer