improving code
before format