Cleaned up formatting for identifiers