cleaned controller