Small factor in o.f.identifiers to insert abstract class, cleaned up unused imports