more code quality fixes