FIX sonar warning for trailing commas