Minor refactoring (for future changes)