Some magic numbers were removed again