Small fix on change from demo from prouction mode

 - We must add --force on dbargs so we can create the Database successfully
 - Improving the code, to avoid some confusion

Change-Id: I62044f4c7582000b8d13b366317375aae988f6a5