database remodelling, refactoring