Removed some duplication