Cleanup latest code
cleanup
cleaned up comments