Remove duplication
Remove some duplication