Minor refactured