controller cleaning commit code