fixing up commenting