PEP8 cleanup;