Refactor refs #16