Cleanup roaring integration code

Mainly fix code style, rename variables, clean up some logic