refactor util classes