[Refactoring] Remove sufix and add option to remove the separator