Some easy-reading improvements