General code cleanup to conform to CodeSniffer standards
General code cleanup to conform to CodeSniffer standards
General code cleanup to conform to CodeSniffer standards