Save some eye bleeding to pythonists
Small optimizations in the new code