Cleanup stylecop and constructors