first refactor
Merge pull request #45 from ynotLeft/refactoring

first refactor