Minor refactor.  Project complete