Started removing some magic numbers