diff --git a/src/codebird.php b/src/codebird.php
index d6f7901..0e9e436 100644
--- a/src/codebird.php
+++ b/src/codebird.php
@@ -265,96 +265,69 @@ public function getApiMethods()
     {
         static $httpmethods = array(
             'GET' => array(
-                // Timelines
-                'statuses/mentions_timeline',
-                'statuses/user_timeline',
-                'statuses/home_timeline',
-                'statuses/retweets_of_me',
-
-                // Tweets
-                'statuses/retweets/:id',
-                'statuses/show/:id',
-                'statuses/oembed',
-                'statuses/retweeters/ids',
-
-                // Search
-                'search/tweets',
-
-                // Direct Messages
+                'account/settings',
+                'account/verify_credentials',
+                'application/rate_limit_status',
+                'blocks/ids',
+                'blocks/list',
                 'direct_messages',
                 'direct_messages/sent',
                 'direct_messages/show',
-
-                // Friends & Followers
-                'friendships/no_retweets/ids',
-                'friends/ids',
+                'favorites/list',
                 'followers/ids',
-                'friendships/lookup',
+                'followers/list',
+                'friends/ids',
+                'friends/list',
                 'friendships/incoming',
+                'friendships/lookup',
+                'friendships/lookup',
+                'friendships/no_retweets/ids',
                 'friendships/outgoing',
                 'friendships/show',
-                'friends/list',
-                'followers/list',
-                'friendships/lookup',
-
-                // Users
-                'account/settings',
-                'account/verify_credentials',
-                'blocks/list',
-                'blocks/ids',
-                'users/show',
-                'users/search',
-                'users/contributees',
-                'users/contributors',
-                'users/profile_banner',
-                'mutes/users/ids',
-                'mutes/users/list',
-
-                // Suggested Users
-                'users/suggestions/:slug',
-                'users/suggestions',
-                'users/suggestions/:slug/members',
-
-                // Favorites
-                'favorites/list',
-
-                // Lists
+                'geo/id/:place_id',
+                'geo/reverse_geocode',
+                'geo/search',
+                'geo/similar_places',
+                'help/configuration',
+                'help/languages',
+                'help/privacy',
+                'help/tos',
                 'lists/list',
-                'lists/statuses',
+                'lists/members',
+                'lists/members/show',
                 'lists/memberships',
+                'lists/ownerships',
+                'lists/show',
+                'lists/statuses',
                 'lists/subscribers',
                 'lists/subscribers/show',
-                'lists/members/show',
-                'lists/members',
-                'lists/show',
                 'lists/subscriptions',
-                'lists/ownerships',
-
-                // Saved searches
+                'mutes/users/ids',
+                'mutes/users/list',
+                'oauth/authenticate',
+                'oauth/authorize',
                 'saved_searches/list',
                 'saved_searches/show/:id',
-
-                // Places & Geo
-                'geo/id/:place_id',
-                'geo/reverse_geocode',
-                'geo/search',
-                'geo/similar_places',
-
-                // Trends
-                'trends/place',
+                'search/tweets',
+                'statuses/home_timeline',
+                'statuses/mentions_timeline',
+                'statuses/oembed',
+                'statuses/retweeters/ids',
+                'statuses/retweets/:id',
+                'statuses/retweets_of_me',
+                'statuses/show/:id',
+                'statuses/user_timeline',
                 'trends/available',
                 'trends/closest',
-
-                // OAuth
-                'oauth/authenticate',
-                'oauth/authorize',
-
-                // Help
-                'help/configuration',
-                'help/languages',
-                'help/privacy',
-                'help/tos',
-                'application/rate_limit_status',
+                'trends/place',
+                'users/contributees',
+                'users/contributors',
+                'users/profile_banner',
+                'users/search',
+                'users/show',
+                'users/suggestions',
+                'users/suggestions/:slug',
+                'users/suggestions/:slug/members',
 
                 // Internal
                 'users/recommendations',
@@ -378,65 +351,48 @@ public function getApiMethods()
                 'beta/timelines/custom/show'
             ),
             'POST' => array(
-                // Tweets
-                'statuses/destroy/:id',
-                'statuses/update',
-                'statuses/retweet/:id',
-                'statuses/update_with_media',
-                'media/upload',
-                'statuses/lookup',
-
-                // Direct Messages
-                'direct_messages/destroy',
-                'direct_messages/new',
-
-                // Friends & Followers
-                'friendships/create',
-                'friendships/destroy',
-                'friendships/update',
-
-                // Users
+                'account/remove_profile_banner',
                 'account/settings__post',
                 'account/update_delivery_device',
                 'account/update_profile',
                 'account/update_profile_background_image',
+                'account/update_profile_banner',
                 'account/update_profile_colors',
                 'account/update_profile_image',
                 'blocks/create',
                 'blocks/destroy',
-                'users/lookup',
-                'account/update_profile_banner',
-                'account/remove_profile_banner',
-                'mutes/users/create',
-                'mutes/users/destroy',
-
-                // Favorites
-                'favorites/destroy',
+                'direct_messages/destroy',
+                'direct_messages/new',
                 'favorites/create',
-
-                // Lists
+                'favorites/destroy',
+                'friendships/create',
+                'friendships/destroy',
+                'friendships/update',
+                'lists/create',
+                'lists/destroy',
+                'lists/members/create',
+                'lists/members/create_all',
                 'lists/members/destroy',
+                'lists/members/destroy_all',
                 'lists/subscribers/create',
                 'lists/subscribers/destroy',
-                'lists/members/create_all',
-                'lists/members/create',
-                'lists/destroy',
                 'lists/update',
-                'lists/create',
-                'lists/members/destroy_all',
-
-                // Saved Searches
-                'saved_searches/create',
-                'saved_searches/destroy/:id',
-
-                // Spam Reporting
-                'users/report_spam',
-
-                // OAuth
+                'media/upload',
+                'mutes/users/create',
+                'mutes/users/destroy',
                 'oauth/access_token',
                 'oauth/request_token',
-                'oauth2/token',
                 'oauth2/invalidate_token',
+                'oauth2/token',
+                'saved_searches/create',
+                'saved_searches/destroy/:id',
+                'statuses/destroy/:id',
+                'statuses/lookup',
+                'statuses/retweet/:id',
+                'statuses/update',
+                'statuses/update_with_media',
+                'users/lookup',
+                'users/report_spam',
 
                 // Internal
                 'direct_messages/read',