Refactor, picking up the ball