General code cleanup to conform to CodeSniffer standards