Readability improvement #3