Minor changes to readability