some popolo-related refactoring