updated python cleanup, changed a few method names