Clean up some magic numbers, oops.