Changed map to multi map
Cleaned up output