removed more magic numbers