added stylecop and comments