reduce 50 lines and more
Merge pull request #12 from yuxxxx/suggest-refactor

reduce 50 lines and more