improved performance, cleaned up identifier paths