Refactor Controllers