SONARPLUGINS-3224 Small refactoring for better readability