enhancing readability #CXF-5688