some code clean up in invariant checker

Change-Id: I9d08e85472d9fffb6e90a83227e7c35b4544eb3a
32 files changed