Minor refac stuff..