#3 Simplify controller code.