Code improvement - Pending sonar issues