addressed some sonar violations of useless operations, unused methods, magic numbers etc.