Comment cleanup/refactor