Simplify Controller a bit.