cleaned up comments, test cases