Minor naming fix
Some inline pragmas
Separate function formatRequest