cleanup
add :header-params restructure