* code refactoring
+ db schema