Minor refactor. :-)