Simplify main controller