Eliminated some magic constants.