Cleaned up map creation