PEP8ed! Missing big rifactor.