Fixed some issues according Sonar Report