changed all strings to constants and updated userHuntWrapper methods