Added comments, removed unused "using" directives