Simplify controller structure