Correcting more code quality issues