Devoncarew refactor