Code cleanup
Add X-Username to header