fixing recent code quality issues