Security hotfix
Simpler comments