Deleted some magic numbers