Code allignment + Type removed from Identifier

Code allignment + Type id removed from Identifier class