Minor refactored