cleaned up some comments & test code