Removes some duplication