Minor refactoring
3 files changed