Made everything PEP 8 compliant