PEP8 cleanup, reorganization