LUN-1260: Improve code readability