Refactor / clean for submittion to PyPy