Reduced some duplication