Minor refactor"