Fixed commenting issues