Extract method

Per discussion with Simon.