Refactoring wg. util