Minor changes to make parts more readable