clean up aggregate source a bit