Comment cleanup stuff