Updated format to give more structure to the application
Order of the variable name for test env
Sanitation tooling
merge with upstream