Remove some duplication