Starting to take away magic numbers