LPS-49254 Make it better readable