Continuing the rewrite for PEP8