fix some code quality issues that crept in