Fix some format problem. Looks good:)