Started rewriting of LTL encoding code