Comment cleanup/addition