diff --git a/routes/api.php b/routes/api.php
index 63cbd41ae6..04ae9cc094 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -11,7 +11,7 @@
 |
 */
 
-Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function () {
+Route::prefix('v0')->namespace('\App\Api\Controllers')->group(function () {
     Route::get('system', 'LegacyApiController@server_info')->name('server_info');
     Route::get('', 'LegacyApiController@show_endpoints');
 
@@ -37,7 +37,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
         Route::get('services', 'LegacyApiController@list_services')->name('list_services');
         Route::get('services/{hostname}', 'LegacyApiController@list_services')->name('list_services_device');
 
-        Route::group(['prefix' => 'resources'], function () {
+        Route::prefix('resources')->group(function () {
             Route::get('links/{id}', 'LegacyApiController@get_link')->name('get_link');
             Route::get('locations', 'LegacyApiController@list_locations')->name('list_locations');
             Route::get('ip/addresses', 'LegacyApiController@list_ip_addresses')->name('list_ip_addresses');
@@ -46,7 +46,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
             Route::get('ip/networks/{id}/ip', 'LegacyApiController@get_network_ip_addresses')->name('get_network_ip_addresses');
         });
 
-        Route::group(['prefix' => 'logs'], function () {
+        Route::prefix('logs')->group(function () {
             Route::get('eventlog/{hostname?}', 'LegacyApiController@list_logs')->name('list_eventlog');
             Route::get('syslog/{hostname?}', 'LegacyApiController@list_logs')->name('list_syslog');
             Route::get('alertlog/{hostname?}', 'LegacyApiController@list_logs')->name('list_alertlog');
@@ -56,7 +56,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
 
     // admin required
     Route::middleware(['can:admin'])->group(function () {
-        Route::group(['prefix' => 'devices'], function () {
+        Route::prefix('devices')->group(function () {
             Route::post('', 'LegacyApiController@add_device')->name('add_device');
             Route::delete('{hostname}', 'LegacyApiController@del_device')->name('del_device');
             Route::patch('{hostname}', 'LegacyApiController@update_device')->name('update_device_field');
@@ -67,7 +67,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
             Route::post('{hostname}/maintenance', 'LegacyApiController@maintenance_device')->name('maintenance_device');
         });
 
-        Route::group(['prefix' => 'devicegroups'], function () {
+        Route::prefix('devicegroups')->group(function () {
             Route::post('{name}/maintenance', 'LegacyApiController@maintenance_devicegroup')->name('maintenance_devicegroup');
         });
 
@@ -97,7 +97,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
     });
 
     // restricted by access
-    Route::group(['prefix' => 'devices'], function () {
+    Route::prefix('devices')->group(function () {
         Route::get('{hostname}', 'LegacyApiController@get_device')->name('get_device');
         Route::get('{hostname}/discover', 'LegacyApiController@trigger_device_discovery')->name('trigger_device_discovery');
         Route::get('{hostname}/availability', 'LegacyApiController@device_availability')->name('device_availability');
@@ -123,7 +123,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
         Route::get('', 'LegacyApiController@list_devices')->name('list_devices');
     });
 
-    Route::group(['prefix' => 'ports'], function () {
+    Route::prefix('ports')->group(function () {
         Route::get('{portid}', 'LegacyApiController@get_port_info')->name('get_port_info');
         Route::get('{portid}/ip', 'LegacyApiController@get_port_ip_addresses')->name('get_port_ip_info');
         Route::get('search/{field}/{search?}', 'LegacyApiController@search_ports')->name('search_ports')->where('search', '.*');
@@ -131,7 +131,7 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
         Route::get('', 'LegacyApiController@get_all_ports')->name('get_all_ports');
     });
 
-    Route::group(['prefix' => 'bills'], function () {
+    Route::prefix('bills')->group(function () {
         Route::get('', 'LegacyApiController@list_bills')->name('list_bills');
         Route::get('{bill_id}', 'LegacyApiController@list_bills')->name('get_bill');
         Route::get('{bill_id}/graphs/{graph_type}', 'LegacyApiController@get_bill_graph')->name('get_bill_graph');
@@ -141,14 +141,14 @@ Route::group(['prefix' => 'v0', 'namespace' => '\App\Api\Controllers'], function
         Route::get('{bill_id}/history/{bill_hist_id}/graphdata/{graph_type}', 'LegacyApiController@get_bill_history_graphdata')->name('get_bill_history_graphdata');
     });
 
-    Route::group(['prefix' => 'routing'], function () {
+    Route::prefix('routing')->group(function () {
         Route::get('bgp/cbgp', 'LegacyApiController@list_cbgp')->name('list_cbgp');
         Route::get('vrf', 'LegacyApiController@list_vrf')->name('list_vrf');
         Route::get('mpls/services', 'LegacyApiController@list_mpls_services')->name('list_mpls_services');
         Route::get('mpls/saps', 'LegacyApiController@list_mpls_saps')->name('list_mpls_saps');
     });
 
-    Route::group(['prefix' => 'resources'], function () {
+    Route::prefix('resources')->group(function () {
         Route::get('fdb', 'LegacyApiController@list_fdb')->name('list_fdb');
         Route::get('fdb/{mac}', 'LegacyApiController@list_fdb')->name('list_fdb_mac');
         Route::get('links', 'LegacyApiController@list_links')->name('list_links');
diff --git a/routes/web.php b/routes/web.php
index 8016e1106d..1aee2ff62f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -28,13 +28,13 @@ Route::get('graph/{path?}', 'GraphController')
     ->middleware(['web', \App\Http\Middleware\AuthenticateGraph::class])->name('graph');
 
 // WebUI
-Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
+Route::middleware('auth')->group([ 'guard' => 'auth'], function () {
 
     // pages
     Route::post('alert/{alert}/ack', [\App\Http\Controllers\AlertController::class, 'ack'])->name('alert.ack');
     Route::resource('device-groups', 'DeviceGroupController');
-    Route::resource('port', 'PortController', ['only' => 'update']);
-    Route::group(['prefix' => 'poller'], function () {
+    Route::resource('port', 'PortController')->only('update');
+    Route::prefix('poller')->group(function () {
         Route::get('', 'PollerController@pollerTab')->name('poller.index');
         Route::get('log', 'PollerController@logTab')->name('poller.log');
         Route::get('groups', 'PollerController@groupsTab')->name('poller.groups');
@@ -49,7 +49,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
         Route::post('templates/remove/{template}', 'ServiceTemplateController@remove')->name('templates.remove');
     });
     Route::get('locations', 'LocationController@index');
-    Route::resource('preferences', 'UserPreferencesController', ['only' => ['index', 'store']]);
+    Route::resource('preferences', 'UserPreferencesController')->only('index', 'store');
     Route::resource('users', 'UserController');
     Route::get('about', 'AboutController@index');
     Route::get('authlog', 'UserController@authlog');
@@ -58,7 +58,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
     Route::view('vminfo', 'vminfo');
 
     // Device Tabs
-    Route::group(['prefix' => 'device/{device}', 'namespace' => 'Device\Tabs', 'as' => 'device.'], function () {
+    Route::prefix('device/{device}')->namespace('Device\Tabs')->name('device.')->group(function () {
         Route::put('notes', 'NotesController@update')->name('notes.update');
     });
 
@@ -66,7 +66,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
         ->name('device')->where(['vars' => '.*']);
 
     // Maps
-    Route::group(['prefix' => 'maps', 'namespace' => 'Maps'], function () {
+    Route::prefix('maps')->namespace('Maps')->group(function () {
         Route::get('devicedependency', 'DeviceDependencyController@dependencyMap');
     });
 
@@ -80,7 +80,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
     Route::put('dashboard/widgets/{widget}', 'WidgetSettingsController@update')->name('dashboard.widget.settings');
 
     // Push notifications
-    Route::group(['prefix' => 'push'], function () {
+    Route::prefix('push')->group(function () {
         Route::get('token', [\App\Http\Controllers\PushNotificationController::class, 'token'])->name('push.token');
         Route::get('key', [\App\Http\Controllers\PushNotificationController::class, 'key'])->name('push.key');
         Route::post('register', [\App\Http\Controllers\PushNotificationController::class, 'register'])->name('push.register');
@@ -88,7 +88,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
     });
 
     // admin pages
-    Route::group(['middleware' => ['can:admin']], function () {
+    Route::middleware('can:admin')->group(function () {
         Route::get('settings/{tab?}/{section?}', 'SettingsController@index')->name('settings');
         Route::put('settings/{name}', 'SettingsController@update')->name('settings.update');
         Route::delete('settings/{name}', 'SettingsController@destroy')->name('settings.destroy');
@@ -115,7 +115,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
     Route::permanentRedirect('poll-log', 'poller/log');
 
     // Two Factor Auth
-    Route::group(['prefix' => '2fa', 'namespace' => 'Auth'], function () {
+    Route::prefix('2fa')->namespace('Auth')->group(function () {
         Route::get('', 'TwoFactorController@showTwoFactorForm')->name('2fa.form');
         Route::post('', 'TwoFactorController@verifyTwoFactor')->name('2fa.verify');
         Route::post('add', 'TwoFactorController@create')->name('2fa.add');
@@ -127,12 +127,12 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
     });
 
     // Ajax routes
-    Route::group(['prefix' => 'ajax'], function () {
+    Route::prefix('ajax')->group(function () {
         // page ajax controllers
-        Route::resource('location', 'LocationController', ['only' => ['update', 'destroy']]);
-        Route::resource('pollergroup', 'PollerGroupController', ['only' => ['destroy']]);
+        Route::resource('location', 'LocationController')->only('update', 'destroy');
+        Route::resource('pollergroup', 'PollerGroupController')->only('destroy');
         // misc ajax controllers
-        Route::group(['namespace' => 'Ajax'], function () {
+        Route::namespace('Ajax')->group(function () {
             Route::get('search/bgp', 'BgpSearchController');
             Route::get('search/device', 'DeviceSearchController');
             Route::get('search/port', 'PortSearchController');
@@ -147,7 +147,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
         Route::get('settings/list', 'SettingsController@listAll')->name('settings.list');
 
         // js select2 data controllers
-        Route::group(['prefix' => 'select', 'namespace' => 'Select'], function () {
+        Route::prefix('select')->namespace('Select')->group(function () {
             Route::get('application', 'ApplicationController')->name('ajax.select.application');
             Route::get('bill', 'BillController')->name('ajax.select.bill');
             Route::get('dashboard', 'DashboardController')->name('ajax.select.dashboard');
@@ -170,7 +170,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
         });
 
         // jquery bootgrid data controllers
-        Route::group(['prefix' => 'table', 'namespace' => 'Table'], function () {
+        Route::prefix('table')->namespace('Table')->group(function () {
             Route::post('alert-schedule', 'AlertScheduleController');
             Route::post('customers', 'CustomersController');
             Route::post('device', 'DeviceController');
@@ -190,7 +190,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
         });
 
         // dashboard widgets
-        Route::group(['prefix' => 'dash', 'namespace' => 'Widgets'], function () {
+        Route::prefix('dash')->namespace('Widgets')->group(function () {
             Route::post('alerts', 'AlertsController');
             Route::post('alertlog', 'AlertlogController');
             Route::post('availability-map', 'AvailabilityMapController');
@@ -220,7 +220,7 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
 });
 
 // installation routes
-Route::group(['prefix' => 'install', 'namespace' => 'Install'], function () {
+Route::prefix('install')->namespace('Install')->group(function () {
     Route::get('/', 'InstallationController@redirectToFirst')->name('install');
     Route::get('/checks', 'ChecksController@index')->name('install.checks');
     Route::get('/database', 'DatabaseController@index')->name('install.database');