Cleanup code format