refactoring & code cleaning
Merge pull request #7 from wiruzx/master

refactoring & code cleaning