Minor changes to make code clearer