Mainly pep8-ification