some cleaning
Merge pull request #6 from sycy600/refactoring

some cleaning