Simplified a bunch of identifiers