[WIP] Refactor controllers

removed this lines