More simplification of controller and list model.