Code format improvement