first minor refactorings
fixes based on code review
Merge branch 'feature-code-review-fixes' into develop
fixes based on code review