refactoring helper, codestyle