Cleaned up map.php