even more code quality fixes..