tidy up
remove sonar violations
refactor and inject jdbctemplates