Clear up some comments