re-use markers and some clean-up