cleaning up comments and tests