Refactor controller route handlers