Minor change to method organisation.