little clean-up + map class