Cleanup, rename some arguments, trying to conform PEP8