LPS-45425 Improve readability