cleaned up comments & test code