removing some duplication