Comment cleanup