More refactoring - complete the change over to Sequel