Minor changes, mainly for readability when there is more than one class.