Minor refactorings.
Merge branch 'develop' of https://github.com/zeminlu/stryker into develop