Attempt at PEP8