Minor changes to make it more readable