Refactor variable name
Update help message
Fix error in database routines