PEP8 cleanup of core.