Removed magic numbers and reduced overriding.