refactor controller method
improved navigation