Minor refactoring
Merged changes