Handle sperator empty case. And reformat code.