Cleaning after advance in exploratory mode

Applied @jguitar 's suggestions