code cleanup: move parameter to aggregate, simplify code

Signed-off-by: Hervé Boutemy <hboutemy@apache.org>

Author: hboutemy