rpearce/mshah - refactoring audit hosts tabulation