cleaned up some comments and TODO: tags