refactoring
Merge pull request #15 from sycy600/refactoring3

refactoring