refactor and removed prefixed util