Merge "Several code quality improvements" into nyc-dev