BLUR-341 formatting issues fixed