Refactor - utils