Made the comments relevant
Removed unused map