Refactoring for work on gold standard.