Some more PEP 8 standards have been met