Fixed 20 blocker issues (Sonar)
10 files changed