refactor and update backlog