re-factoring some of identifiers
some work on main identifiers