Started refactoring assignment
stylecop file