Attempting to remove some number magic.