Code readability, #889