Improve code format