Topic/refactor ansible