Fix layout and code format