controllers refactor
controller refactor