adjusted generator and modelObject templates to create cleaner database