Minor refactoring: simplify code
3 files changed