pep8
Cleanup, addContext function