Improve the code format