Fix spacing and missing parameters 

It does keep spacing consistent.
Pass headers for all verbs.