tiny bit more refactorings
Merge pull request #48 from bayendor/refactor-main

tiny bit more refactorings