Worked on some Sonar suggestions