Code cleanup and feedback

Add defensive checks for resources to confirm they have a type and name
Rename options to sqlCliArgs to not override options parameter