adding constants
remove unused method
fix multiple sonar violations