Added No Duplicates option
Fixed indentation