Refactor util to simplify. #125

Closed johnsteele closed 3 years ago