Refactored utilities

Some of the utilities have been replaced with those from @codemod-utils. This should help reduce the maintenance cost.