Added useless curly brackets around one lined if statements in order to make sonar happy..
cleaned some warnings