mvc refactoring.