Jeremy | Minor refactor with Steve