Another instance of controller simplification, Not-static class