Cleanup some comments