Small refactorings
Merge branch 'master' of github.com:warvariuc/pyaiml