- Minor refactoring