#NO_ISSUE some refactorings
changes based on feedback
further refactoring of
Merge pull request #270 from drexin/wip-refactoring-drexin

#NO_ISSUE some refactorings