clean up some comments and code