Fixed commenting and style issues