some lite refactoring
since 210 campaign