optimized MapRadius & code formatting