Update doc blocks
Refactor because of source path
Fix Issue #8
Remove unneeded tasks
Change indent
Add database params only if set, change quotes