Readability improvement #2