Minor changes to make code less confusing