Removing Magic Numbers