minor clean up - add identifiers id once and use it elsewhere