cleanup
move Option::SEPARATOR insertion in loop
version 9.3.37