Refactor catalog controllers