Cleaned up, integrated pypy runner with the rest of code.