Minor refac