refs #13 Refactor.