added Sonar props and implemented some of it's suggestions