Refactoring ControllerDate