Refactor into one controller