Cleaned up how identifiers work.