QRAnalyzer - Small refactoring