remove more magic numbers