Removed some duplication across drivers