Removed dead code
Typo in header
Clean header
Test for blkvar is always done inside constraint later on
Test for blkvar is always done inside minus later on