Removed old zfs powered query method
small clean up
Added function for generating dictionary