Code cleaning up for Db model
Merge branch 'develop' into user