Minor refact