More cleaning to the controller
More cleaning