removing commented out code
some tests written, some extraneous code removed