reduces nesting in interpreter sources
Merge pull request #18 from xeno-by/scala

reduces nesting in interpreter sources