Some magic numbers were removed