Cleaned up some thing and made sure verbs are used for params