Clean controller. Fix #16