Jeremy | Minor refactor