Code cleanup / Sonar check