PEP8 and a few renames, we're going public...