rename CSP headeer constant variable name
Some cleanup around the guard config
remove ugly and superfluous "//*"