Some refactoring done
Merge branch 'master' of github.com:grebnafets/let-there-be-tie