Now completely PEP8-compliant (hopefully)