Code format cleanup
Code cleanup