Refactoring done
Refactoring done
Vet cleanups
Moving some funcs to utils
local fixes