Made Identifier class static, Clause class completed