Code autoformat
Fix 2i based predicate and a bit prettify
bump version