some methods and calls extracted
Merge branch 'master' of https://github.com/immogen/testRefactoring