cleaning up comment templates