Cleaned map implementation