fix some messy code problem
tiny modify