clean up Ohai structures; consolidate topics