removed test code
cleaned up comments