comment and refcotring changes