Minor refactor of background