clean base controller + comments