Refactor and update utils