Minor refactor on backlog.