Refactor patch utils