Readability improvement