Refactor dev utils