#4344 Fixes of code formating.