PEP8-ify; remove cleanup code since I think that might be causing problems