Remove whitespace and add constant for rollup event