Update project config
clean up
Use variables