Bit of optimisation and format