Update controllersnames and imporved coding style