Minor changes to fix readability