refactored

cleanup map and minsweep