Some cleanup of adjectives