fixed: code quality