Removed more magic numbers.