Removing more magic numbers