Removed some magic numbers