Removed more magical numbers.