Tidy-up DbMaker