Refactoring: code cleanup
Merge pull request #44 from Yurokle/master

Refactoring: code cleanup