Removed more magic numbers