refs #42 — Solved about 100 sonar issues