Added auto id for created checks

Change-Id: Idaa850c00539ba01a29cfffa16ffec01ad830572
More style issues fixed

Change-Id: I707ba007c7cf4120942b84006ab2338a7218de4e