NXP-15039 sonar code clean