Refactor to use only 1 controller method
Remove unnecessary check if  is set