Removed unnecessary default value for option
Default db name in variable
Organized methods