Code readability has been improved