Minor Cleanup and DH usage

Cleaned up some of the code, figured out how to call DH instance for
Adapter and Activity