fixed a bunch of sonar issues