Cleanup roaring integration code

Mainly fix code style, rename variables, clean up some logic
@xvrl  I am having a look right now. Still digging in the code...