Code readability improved