Merge branch 'net-sealevel-clean-up-some-code-style-issues'