small refactoring
3 files changed