PEP 8 modifications