Merge "Code cleanup to conform to style guide / linter."