Restyle of the code part two