cleaned controller. removed comments