DW: Refactored all methods to util