Renamed variables to match styleguid and modified securityrules