Minor: add DB package name around more variables just for clarity