v6.02 simplify readibility