bug fix & little change
code style
remove unused file