[ref] Small refactor and added unique() method