format manually & fix an code issue