Reorganize code and change separators