Further cleaned controller