Fixed ZEN-11591 issue

I'd rather not having style related formatting changes included with functional changes. It creates the possibility of missing accidental functional changes and potentially making the patch harder to merge with different parents.