Reformat code
Removed head user and tenant