ACCUMULO-1919 add missing import
ACCUMUMLO-2255 more little cleanups and class extractions