All specs and scenarios passing. Time to refactor