Some code format clean up