Added MapId
Formatting
Removed try-catch