Code Cleanup.
Implement identifier field.