Removed some magic values...