improved some identifiers