Minor refactor start