Code cleanup.
Merge branch 'code-cleanup' into develop
Lint fixes.