Fix :body JSON issue and rename helpers to util