shopDB - refactoring