Refactor, adding marker instead map.clear