PEP 8 compliance. Almost done...