Merge "Sonar Fix- Main.java"