utils and shortcuts files update refactor.