Minor refactor. OCD taking over.