refactor + cleanup adapter and diffanalyzer