Integrated CL comments and more defaultValue cleanup of vars