Clean up and add separator when completing with single option