Changes related to readability