cleanup
python prefers the unsimplified code at the moment