Minor refactor :haircut:.