Some minor fixes to make PEP-8