pythonesque Some cleanup.