Refactor, sprint 2 alku