Comments and more descriptible function names, rework on separator handler part in order to remove the bool parameter