Code format cleanup