decoupleing util and handlers. global refactoring