Refactor in preparation for methods to add more samples.