Minor changes to make the code clearer