fixed: code quality + dependencies