Better object/class organisation.