cleaned up; added pypy