Implemented Sonar report Comments