Braces added to implement/override method templates
#SCL-6326 fixed
Some cleaning