Readability improvement #4