Change all Private class categories to be class extensions, and move all ivars into them (from headers).

63 files changed, 277 insertions, 285 deletions

diff --git a/Source/Classes/MUAboutViewController.m b/Source/Classes/MUAboutViewController.m
index 6f557b0..47efb8b 100644
--- a/Source/Classes/MUAboutViewController.m
+++ b/Source/Classes/MUAboutViewController.m
@@ -30,7 +30,7 @@
 
 #import "MUAboutViewController.h"
 
-@interface MUAboutViewController (Private)
+@interface MUAboutViewController ()
 - (void) doneButtonClicked:(UIBarButtonItem *)doneButton;
 @end
 
diff --git a/Source/Classes/MUApplication.h b/Source/Classes/MUApplication.h
index b24e726..c05650c 100644
--- a/Source/Classes/MUApplication.h
+++ b/Source/Classes/MUApplication.h
@@ -28,19 +28,14 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-@class AppDelegate;
+@class MUApplicationDelegate;
 
 #define MumbleApp ((MUApplication *)[MUApplication sharedApplication])
 
-@interface MUApplication : UIApplication {
-	NSString *_crashTokenPath;
-}
-
+@interface MUApplication : UIApplication
 - (id) init;
 - (void) dealloc;
-
-- (AppDelegate *) delegate;
+- (MUApplicationDelegate *) delegate;
 - (BOOL) didCrashRecently;
 - (void) resetCrashCount;
-
 @end
diff --git a/Source/Classes/MUApplication.m b/Source/Classes/MUApplication.m
index 52bd6a1..b34d44b 100644
--- a/Source/Classes/MUApplication.m
+++ b/Source/Classes/MUApplication.m
@@ -83,7 +83,9 @@ static void crashhandler_handle_crash() {
 	fclose(f);
 }
 
-@interface MUApplication (Private)
+@interface MUApplication () {
+    NSString *_crashTokenPath;
+}
 - (void) setupCrashHandler;
 - (void) setupLogFile;
 @end
@@ -103,8 +105,8 @@ static void crashhandler_handle_crash() {
 	[super dealloc];
 }
 
-- (AppDelegate *) delegate {
-	return (AppDelegate *)[super delegate];
+- (MUApplicationDelegate *) delegate {
+	return (MUApplicationDelegate *)[super delegate];
 }
 
 // Setup the crash notification handler
diff --git a/Source/Classes/MUApplicationDelegate.h b/Source/Classes/MUApplicationDelegate.h
index 8bbfb48..a1117d4 100644
--- a/Source/Classes/MUApplicationDelegate.h
+++ b/Source/Classes/MUApplicationDelegate.h
@@ -30,12 +30,7 @@
 
 #import "MUVersionChecker.h"
 
-@interface MUApplicationDelegate : NSObject <UIApplicationDelegate> {
-	UIWindow                *window;
-	UINavigationController  *navigationController;
-	NSDate                  *_launchDate;
-	MUVersionChecker          *_verCheck;
-}
+@interface MUApplicationDelegate : NSObject <UIApplicationDelegate> 
 
 @property (nonatomic, retain) IBOutlet UIWindow *window;
 @property (nonatomic, retain) IBOutlet UINavigationController *navigationController;
diff --git a/Source/Classes/MUApplicationDelegate.m b/Source/Classes/MUApplicationDelegate.m
index 8036303..2e5ee2e 100644
--- a/Source/Classes/MUApplicationDelegate.m
+++ b/Source/Classes/MUApplicationDelegate.m
@@ -38,7 +38,12 @@
 #import <MumbleKit/MKAudio.h>
 #import <MumbleKit/MKConnectionController.h>
 
-@interface MUApplicationDelegate (Private)
+@interface MUApplicationDelegate () {
+    UIWindow                  *window;
+    UINavigationController    *navigationController;
+    NSDate                    *_launchDate;
+    MUVersionChecker          *_verCheck;
+}
 - (void) setupAudio;
 - (void) notifyCrash;
 @end
diff --git a/Source/Classes/MUCertificateCell.h b/Source/Classes/MUCertificateCell.h
index d8bcb26..38db3d2 100644
--- a/Source/Classes/MUCertificateCell.h
+++ b/Source/Classes/MUCertificateCell.h
@@ -30,14 +30,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MUCertificateCell : UITableViewCell {
-    IBOutlet UIImageView  *_certImage;
-    IBOutlet UILabel      *_nameLabel;
-    IBOutlet UILabel      *_emailLabel;
-    IBOutlet UILabel      *_issuerLabel;
-    IBOutlet UILabel      *_expiryLabel;
-    BOOL                  _isCurrentCert;
-}
+@interface MUCertificateCell : UITableViewCell
 
 + (MUCertificateCell *) loadFromNib;
 
diff --git a/Source/Classes/MUCertificateCell.m b/Source/Classes/MUCertificateCell.m
index b37c373..002417c 100644
--- a/Source/Classes/MUCertificateCell.m
+++ b/Source/Classes/MUCertificateCell.m
@@ -30,6 +30,16 @@
 
 #import "MUCertificateCell.h"
 
+@interface MUCertificateCell () {
+    IBOutlet UIImageView  *_certImage;
+    IBOutlet UILabel      *_nameLabel;
+    IBOutlet UILabel      *_emailLabel;
+    IBOutlet UILabel      *_issuerLabel;
+    IBOutlet UILabel      *_expiryLabel;
+    BOOL                  _isCurrentCert;
+}
+@end
+
 @implementation MUCertificateCell
 
 + (MUCertificateCell *) loadFromNib {
diff --git a/Source/Classes/MUCertificateController.h b/Source/Classes/MUCertificateController.h
index 36e950b..7139b3f 100644
--- a/Source/Classes/MUCertificateController.h
+++ b/Source/Classes/MUCertificateController.h
@@ -32,13 +32,14 @@
 #import <MumbleKit/MKCertificate.h>
 
 @interface MUCertificateController : NSObject
+
 + (MKCertificate *) certificateWithPersistentRef:(NSData *)persistentRef;
 + (OSStatus) deleteCertificateWithPersistentRef:(NSData *)persistentRef;
 
 + (void) setDefaultCertificateByPersistentRef:(NSData *)persistentRef;
 + (MKCertificate *) defaultCertificate;
 
-
 + (NSArray *) rawCertificates;
 + (NSArray *) allPersistentRefs;
+
 @end
diff --git a/Source/Classes/MUCertificateCreationProgressView.h b/Source/Classes/MUCertificateCreationProgressView.h
index 2a7de05..9bb8596 100644
--- a/Source/Classes/MUCertificateCreationProgressView.h
+++ b/Source/Classes/MUCertificateCreationProgressView.h
@@ -28,17 +28,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-@interface MUCertificateCreationProgressView : UIViewController {
-	IBOutlet UIActivityIndicatorView  *_activityIndicator;
-	IBOutlet UILabel                  *_nameLabel;
-	IBOutlet UILabel                  *_emailLabel;
-
-	NSString                          *_identityName;
-	NSString                          *_emailAddress;
-	id                                _delegate;
-}
-
+@interface MUCertificateCreationProgressView : UIViewController
 - (id) initWithName:(NSString *)name email:(NSString *)email;
 - (void) dealloc;
-
 @end
\ No newline at end of file
diff --git a/Source/Classes/MUCertificateCreationProgressView.m b/Source/Classes/MUCertificateCreationProgressView.m
index f35f99e..0f12edc 100644
--- a/Source/Classes/MUCertificateCreationProgressView.m
+++ b/Source/Classes/MUCertificateCreationProgressView.m
@@ -30,6 +30,17 @@
 
 #import "MUCertificateCreationProgressView.h"
 
+@interface MUCertificateCreationProgressView () {
+    IBOutlet UIActivityIndicatorView  *_activityIndicator;
+	IBOutlet UILabel                  *_nameLabel;
+	IBOutlet UILabel                  *_emailLabel;
+    
+	NSString                          *_identityName;
+	NSString                          *_emailAddress;
+	id                                _delegate;
+}
+@end
+
 @implementation MUCertificateCreationProgressView
 
 - (id) initWithName:(NSString *)name email:(NSString *)email {
diff --git a/Source/Classes/MUCertificateCreationView.h b/Source/Classes/MUCertificateCreationView.h
index c9ca1ed..f079a0d 100644
--- a/Source/Classes/MUCertificateCreationView.h
+++ b/Source/Classes/MUCertificateCreationView.h
@@ -30,12 +30,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MUCertificateCreationView : UITableViewController {
-	NSString  *_fullName;
-	NSString  *_emailAddress;
-}
-
+@interface MUCertificateCreationView : UITableViewController
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUCertificateCreationView.m b/Source/Classes/MUCertificateCreationView.m
index 3425dd0..1f02318 100644
--- a/Source/Classes/MUCertificateCreationView.m
+++ b/Source/Classes/MUCertificateCreationView.m
@@ -43,6 +43,12 @@ static void ShowAlertDialog(NSString *title, NSString *msg) {
 	});
 }
 
+@interface MUCertificateCreationView () {
+    NSString  *_fullName;
+    NSString  *_emailAddress;
+}
+@end
+
 @implementation MUCertificateCreationView
 
 #pragma mark -
diff --git a/Source/Classes/MUCertificateDiskImportViewController.h b/Source/Classes/MUCertificateDiskImportViewController.h
index 140ec65..ccc65b1 100644
--- a/Source/Classes/MUCertificateDiskImportViewController.h
+++ b/Source/Classes/MUCertificateDiskImportViewController.h
@@ -28,11 +28,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-@interface MUCertificateDiskImportViewController : UITableViewController <UIAlertViewDelegate, UITextFieldDelegate> {
-    BOOL             _showHelp;
-    NSMutableArray   *_diskCertificates;
-    NSIndexPath      *_attemptIndexPath;
-    UITextField      *_passwordField;
-}
+@interface MUCertificateDiskImportViewController : UITableViewController <UIAlertViewDelegate, UITextFieldDelegate>
+
+- (id) init;
+- (void) dealloc;
 
 @end
diff --git a/Source/Classes/MUCertificateDiskImportViewController.m b/Source/Classes/MUCertificateDiskImportViewController.m
index 9579503..a07f5f9 100644
--- a/Source/Classes/MUCertificateDiskImportViewController.m
+++ b/Source/Classes/MUCertificateDiskImportViewController.m
@@ -32,7 +32,6 @@
 #import "MUCertificateController.h"
 #import "MUCertificateCell.h"
 
-
 static void ShowAlertDialog(NSString *title, NSString *msg) {
 	dispatch_async(dispatch_get_main_queue(), ^{
 		UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title message:msg delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
@@ -41,13 +40,18 @@ static void ShowAlertDialog(NSString *title, NSString *msg) {
 	});
 }
 
-@implementation MUCertificateDiskImportViewController
-
-@interface MUCertificateDiskImportViewController (Private)
+@interface MUCertificateDiskImportViewController () {
+    BOOL             _showHelp;
+    NSMutableArray   *_diskCertificates;
+    NSIndexPath      *_attemptIndexPath;
+    UITextField      *_passwordField;
+}
 - (void) tryImportCertificateWithPassword:(NSString *)password;
 - (void) showPasswordDialog;
 @end
 
+@implementation MUCertificateDiskImportViewController
+
 - (id) init {
     UITableViewStyle style = UITableViewStyleGrouped;
     NSArray *documentDirs = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
diff --git a/Source/Classes/MUCertificatePickerViewController.h b/Source/Classes/MUCertificatePickerViewController.h
index 9ba8e37..8fbf71e 100644
--- a/Source/Classes/MUCertificatePickerViewController.h
+++ b/Source/Classes/MUCertificatePickerViewController.h
@@ -36,12 +36,7 @@
 - (void) certificatePickerViewController:(MUCertificatePickerViewController *)certPicker didSelectCertificate:(NSData *)persistentRef;
 @end
 
-@interface MUCertificatePickerViewController : UITableViewController {
-	NSMutableArray                               *_certificateItems;
-	id<CertificatePickerViewControllerDelegate>  _delegate;
-	NSUInteger                                   _selectedRow;
-	NSData                                       *_selected;
-}
+@interface MUCertificatePickerViewController : UITableViewController
 
 - (id) initWithPersistentRef:(NSData *)persistentRef;
 - (void) dealloc;
diff --git a/Source/Classes/MUCertificatePickerViewController.m b/Source/Classes/MUCertificatePickerViewController.m
index 149e3b1..8d3112c 100644
--- a/Source/Classes/MUCertificatePickerViewController.m
+++ b/Source/Classes/MUCertificatePickerViewController.m
@@ -34,7 +34,12 @@
 
 #import <MumbleKit/MKCertificate.h>
 
-@interface MUCertificatePickerViewController (Private)
+@interface MUCertificatePickerViewController () {
+    NSMutableArray                               *_certificateItems;
+    id<CertificatePickerViewControllerDelegate>  _delegate;
+    NSUInteger                                   _selectedRow;
+    NSData                                       *_selected;
+}
 - (void) fetchCertificates;
 @end
 
diff --git a/Source/Classes/MUCertificatePreferencesViewController.h b/Source/Classes/MUCertificatePreferencesViewController.h
index 05c816d..d2a4645 100644
--- a/Source/Classes/MUCertificatePreferencesViewController.h
+++ b/Source/Classes/MUCertificatePreferencesViewController.h
@@ -29,13 +29,7 @@
 */
 
 
-@interface MUCertificatePreferencesViewController : UITableViewController <UIActionSheetDelegate> {
-	NSMutableArray   *_certificateItems;
-	BOOL             _picker;
-	NSUInteger       _selectedIndex;
-}
-
+@interface MUCertificatePreferencesViewController : UITableViewController <UIActionSheetDelegate>
 - (id) init;
 - (void) dealloc;
-
-@end
+@end
\ No newline at end of file
diff --git a/Source/Classes/MUCertificatePreferencesViewController.m b/Source/Classes/MUCertificatePreferencesViewController.m
index d1312fe..bfab82d 100644
--- a/Source/Classes/MUCertificatePreferencesViewController.m
+++ b/Source/Classes/MUCertificatePreferencesViewController.m
@@ -37,13 +37,15 @@
 
 #import <MumbleKit/MKCertificate.h>
 
-
-@interface MUCertificatePreferencesViewController (Private)
+@interface MUCertificatePreferencesViewController () {
+	NSMutableArray   *_certificateItems;
+	BOOL             _picker;
+	NSUInteger       _selectedIndex;
+}
 - (void) fetchCertificates;
 - (void) deleteCertificateForRow:(NSUInteger)row;
 @end
 
-
 @implementation MUCertificatePreferencesViewController
 
 #pragma mark -
diff --git a/Source/Classes/MUCertificateViewController.h b/Source/Classes/MUCertificateViewController.h
index 19686d4..c958c51 100644
--- a/Source/Classes/MUCertificateViewController.h
+++ b/Source/Classes/MUCertificateViewController.h
@@ -32,14 +32,7 @@
 
 @class MKCertificate;
 
-@interface MUCertificateViewController : UITableViewController {
-	NSInteger           _curIdx;
-	NSArray             *_certificates;
-	NSArray             *_subjectItems;
-	NSArray             *_issuerItems;
-	NSString            *_certTitle;
-	UISegmentedControl  *_arrows;
-}
+@interface MUCertificateViewController : UITableViewController
 
 - (id) initWithCertificate:(MKCertificate *)cert;
 - (id) initWithCertificates:(NSArray *)certs;
diff --git a/Source/Classes/MUCertificateViewController.m b/Source/Classes/MUCertificateViewController.m
index f2cea42..accaeb1 100644
--- a/Source/Classes/MUCertificateViewController.m
+++ b/Source/Classes/MUCertificateViewController.m
@@ -36,6 +36,16 @@ static const NSUInteger CertificateViewSectionSubject            = 0;
 static const NSUInteger CertificateViewSectionIssuer             = 1;
 static const NSUInteger CertificateViewSectionTotal              = 2;
 
+@interface MUCertificateViewController () {
+    NSInteger           _curIdx;
+    NSArray             *_certificates;
+    NSArray             *_subjectItems;
+    NSArray             *_issuerItems;
+    NSString            *_certTitle;
+    UISegmentedControl  *_arrows;
+}
+@end
+
 @implementation MUCertificateViewController
 
 #pragma mark -
diff --git a/Source/Classes/MUChannelNavigationViewController.h b/Source/Classes/MUChannelNavigationViewController.h
index d7acc58..10c461f 100644
--- a/Source/Classes/MUChannelNavigationViewController.h
+++ b/Source/Classes/MUChannelNavigationViewController.h
@@ -30,14 +30,7 @@
 
 #import <MumbleKit/MKServerModel.h>
 
-@interface MUChannelNavigationViewController : UITableViewController {
-	MKServerModel        *_serverModel;
-	NSMutableArray       *_modelItems;
-	NSMutableDictionary  *_userIndexMap;
-	NSMutableDictionary  *_channelIndexMap;
-}
-
+@interface MUChannelNavigationViewController : UITableViewController
 - (id) initWithServerModel:(MKServerModel *)serverModel;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUChannelNavigationViewController.m b/Source/Classes/MUChannelNavigationViewController.m
index f596651..0340328 100644
--- a/Source/Classes/MUChannelNavigationViewController.m
+++ b/Source/Classes/MUChannelNavigationViewController.m
@@ -78,7 +78,12 @@
 #pragma mark -
 #pragma mark MUChannelNavigationViewController
 
-@interface MUChannelNavigationViewController (Private)
+@interface MUChannelNavigationViewController () {
+    MKServerModel        *_serverModel;
+	NSMutableArray       *_modelItems;
+	NSMutableDictionary  *_userIndexMap;
+	NSMutableDictionary  *_channelIndexMap;
+}
 - (void) rebuildModelArrayFromChannel:(MKChannel *)channel;
 - (void) addChannelTreeToModel:(MKChannel *)channel indentLevel:(NSInteger)indentLevel;
 @end
diff --git a/Source/Classes/MUChannelViewController.h b/Source/Classes/MUChannelViewController.h
index 69bdf33..e34ccb3 100644
--- a/Source/Classes/MUChannelViewController.h
+++ b/Source/Classes/MUChannelViewController.h
@@ -31,22 +31,7 @@
 #import <MumbleKit/MKChannel.h>
 #import <MumbleKit/MKServerModel.h>
 
-typedef enum {
-	ChannelViewSectionSubChannels    = 0,
-	ChannelViewSectionUsers          = 1,
-	ChannelViewSectionActions        = 2,
-} ChannelViewSection;
-
-typedef enum {
-	ChannelViewActionJoinChannel     = 0,
-} ChannelViewAction;
-
-@interface MUChannelViewController : UITableViewController {
-	MKChannel *_channel;
-	MKServerModel *_model;
-}
-
+@interface MUChannelViewController : UITableViewController
 - (id) initWithChannel:(MKChannel *)channel serverModel:(MKServerModel *)model;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUChannelViewController.m b/Source/Classes/MUChannelViewController.m
index 9bb3d62..129381c 100644
--- a/Source/Classes/MUChannelViewController.m
+++ b/Source/Classes/MUChannelViewController.m
@@ -30,6 +30,22 @@
 
 #import "MUChannelViewController.h"
 
+typedef enum {
+	ChannelViewSectionSubChannels    = 0,
+	ChannelViewSectionUsers          = 1,
+	ChannelViewSectionActions        = 2,
+} ChannelViewSection;
+
+typedef enum {
+	ChannelViewActionJoinChannel     = 0,
+} ChannelViewAction;
+
+@interface MUChannelViewController () {
+    MKChannel      *_channel;
+    MKServerModel  *_model;
+}
+@end
+
 @implementation MUChannelViewController
 
 - (id) initWithChannel:(MKChannel *)channel serverModel:(MKServerModel *)model {
diff --git a/Source/Classes/MUCountryServerListController.h b/Source/Classes/MUCountryServerListController.h
index a9f1948..5270762 100644
--- a/Source/Classes/MUCountryServerListController.h
+++ b/Source/Classes/MUCountryServerListController.h
@@ -28,14 +28,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-@interface MUCountryServerListController : UITableViewController <UIActionSheetDelegate> {
-	NSArray *_countryServers;
-	NSString *_countryName;
-}
-
+@interface MUCountryServerListController : UITableViewController <UIActionSheetDelegate> 
 - (id) initWithName:(NSString *)country serverList:(NSArray *)servers;
 - (void) dealloc;
-
 - (void) presentAddAsFavouriteDialogForServer:(NSDictionary *)serverItem;
-
 @end
diff --git a/Source/Classes/MUCountryServerListController.m b/Source/Classes/MUCountryServerListController.m
index 7d4209a..b2673e2 100644
--- a/Source/Classes/MUCountryServerListController.m
+++ b/Source/Classes/MUCountryServerListController.m
@@ -37,6 +37,12 @@
 
 #import "MUServerCell.h"
 
+@interface MUCountryServerListController () {
+    NSArray   *_countryServers;
+    NSString  *_countryName;
+}
+@end
+
 @implementation MUCountryServerListController
 
 - (id) initWithName:(NSString *)country serverList:(NSArray *)servers {
diff --git a/Source/Classes/MUDatabase.m b/Source/Classes/MUDatabase.m
index 1cced15..bac34d3 100644
--- a/Source/Classes/MUDatabase.m
+++ b/Source/Classes/MUDatabase.m
@@ -33,7 +33,7 @@
 
 static FMDatabase *db = nil;
 
-@interface MUDatabase (Private)
+@interface MUDatabase ()
 + (BOOL) enableForeignKeySupport;
 @end
 
diff --git a/Source/Classes/MUDiagnosticsViewController.h b/Source/Classes/MUDiagnosticsViewController.h
index dbd191a..3bd2e8c 100644
--- a/Source/Classes/MUDiagnosticsViewController.h
+++ b/Source/Classes/MUDiagnosticsViewController.h
@@ -30,23 +30,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MUDiagnosticsViewController : UITableViewController {
-	UITableViewCell *_deviceCell;
-	UITableViewCell *_osCell;
-	UITableViewCell *_udidCell;
-
-	UITableViewCell *_versionCell;
-	UITableViewCell *_gitRevCell;
-	UITableViewCell *_buildDateCell;
-	UITableViewCell *_sinceLaunchCell;
-
-	UITableViewCell *_preprocessorCell;
-	UITableViewCell *_routeCell;
-
-	NSTimer *_updateTimer;
-}
-
+@interface MUDiagnosticsViewController : UITableViewController
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUDiagnosticsViewController.m b/Source/Classes/MUDiagnosticsViewController.m
index 501d386..4453612 100644
--- a/Source/Classes/MUDiagnosticsViewController.m
+++ b/Source/Classes/MUDiagnosticsViewController.m
@@ -37,7 +37,22 @@
 #import "MUApplicationDelegate.h"
 #import "MUDiagnosticsViewController.h"
 
-@interface MUDiagnosticsViewController (Private)
+@interface MUDiagnosticsViewController () {
+    UITableViewCell *_deviceCell;
+    UITableViewCell *_osCell;
+    UITableViewCell *_udidCell;
+
+    UITableViewCell *_versionCell;
+    UITableViewCell *_gitRevCell;
+    UITableViewCell *_buildDateCell;
+    UITableViewCell *_sinceLaunchCell;
+
+    UITableViewCell *_preprocessorCell;
+    UITableViewCell *_routeCell;
+
+    NSTimer *_updateTimer;
+}
+
 - (void) updateDiagnostics:(NSTimer *)timer;
 
 - (NSString *) deviceString;
@@ -256,7 +271,7 @@
 	[[_preprocessorCell detailTextLabel] setText:[NSString stringWithFormat:@"%li µs", data.avgPreprocessorRuntime]];
 	[[_routeCell detailTextLabel] setText:[audio currentAudioRoute]];
 
-	[[_sinceLaunchCell detailTextLabel] setText:[NSString stringWithFormat:@"%.2f", [(AppDelegate *)[[UIApplication sharedApplication] delegate] timeIntervalSinceLaunch]]];
+	[[_sinceLaunchCell detailTextLabel] setText:[NSString stringWithFormat:@"%.2f", [(MUApplicationDelegate *)[[UIApplication sharedApplication] delegate] timeIntervalSinceLaunch]]];
 }
 
 - (NSData *) formEncodedDictionary:(NSDictionary *)dict boundary:(NSString *)boundary {
diff --git a/Source/Classes/MUFavouriteServer.h b/Source/Classes/MUFavouriteServer.h
index d3f491c..182f672 100644
--- a/Source/Classes/MUFavouriteServer.h
+++ b/Source/Classes/MUFavouriteServer.h
@@ -28,14 +28,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-@interface MUFavouriteServer : NSObject <NSCopying> {
-	NSInteger  _pkey;
-	NSString   *_displayName;
-	NSString   *_hostName;
-	NSUInteger _port;
-	NSString   *_userName;
-	NSString   *_password;
-}
+@interface MUFavouriteServer : NSObject <NSCopying>
 
 - (id) initWithDisplayName:(NSString *)displayName hostName:(NSString *)hostName port:(NSUInteger)port userName:(NSString *)userName password:(NSString *)passWord;
 - (id) init;
diff --git a/Source/Classes/MUFavouriteServer.m b/Source/Classes/MUFavouriteServer.m
index 35cd158..06c60d6 100644
--- a/Source/Classes/MUFavouriteServer.m
+++ b/Source/Classes/MUFavouriteServer.m
@@ -31,6 +31,16 @@
 #import "MUFavouriteServer.h"
 #import "MUDatabase.h"
 
+@interface MUFavouriteServer () {
+    NSInteger  _pkey;
+    NSString   *_displayName;
+    NSString   *_hostName;
+    NSUInteger _port;
+    NSString   *_userName;
+    NSString   *_password;
+}
+@end
+
 @implementation MUFavouriteServer
 
 @synthesize primaryKey         = _pkey;
diff --git a/Source/Classes/MUFavouriteServerEditViewController.h b/Source/Classes/MUFavouriteServerEditViewController.h
index 5d43c80..c217221 100644
--- a/Source/Classes/MUFavouriteServerEditViewController.h
+++ b/Source/Classes/MUFavouriteServerEditViewController.h
@@ -30,13 +30,7 @@
 
 #import "MUFavouriteServer.h"
 
-@interface MUFavouriteServerEditViewController : UITableViewController {
-	BOOL _editMode;
-	MUFavouriteServer *_favourite;
-	id _target;
-	SEL _doneAction;
-}
-
+@interface MUFavouriteServerEditViewController : UITableViewController 
 - (id) initInEditMode:(BOOL)editMode withContentOfFavouriteServer:(MUFavouriteServer *)favServ;
 - (id) init;
 - (void) dealloc;
diff --git a/Source/Classes/MUFavouriteServerEditViewController.m b/Source/Classes/MUFavouriteServerEditViewController.m
index e7c2947..4bf263a 100644
--- a/Source/Classes/MUFavouriteServerEditViewController.m
+++ b/Source/Classes/MUFavouriteServerEditViewController.m
@@ -44,7 +44,12 @@ static NSUInteger FavouriteServerPlaceholderPortInteger = 64738;
 static NSString *FavouriteServerPlaceholderUsername     = @"MumbleUser";
 static NSString *FavouriteServerPlaceholderPassword     = @"Optional";
 
-@interface MUFavouriteServerEditViewController (Private)
+@interface MUFavouriteServerEditViewController () {
+    BOOL               _editMode;
+    MUFavouriteServer  *_favourite;
+    id                 _target;
+    SEL                _doneAction;
+}
 - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView;
 @end
 
diff --git a/Source/Classes/MUFavouriteServerListController.h b/Source/Classes/MUFavouriteServerListController.h
index 70e0fc9..ec4d07d 100644
--- a/Source/Classes/MUFavouriteServerListController.h
+++ b/Source/Classes/MUFavouriteServerListController.h
@@ -30,16 +30,9 @@
 
 #import "MUFavouriteServer.h"
 
-@interface MUFavouriteServerListController : UITableViewController <UIActionSheetDelegate> {
-	NSMutableArray   *_favouriteServers;
-	BOOL             _editMode;
-	MUFavouriteServer  *_editedServer;
-}
-
+@interface MUFavouriteServerListController : UITableViewController <UIActionSheetDelegate>
 - (id) init;
 - (void) dealloc;
-
 - (void) presentNewFavouriteDialog;
 - (void) presentEditDialogForFavourite:(MUFavouriteServer *)favServ;
-
 @end
diff --git a/Source/Classes/MUFavouriteServerListController.m b/Source/Classes/MUFavouriteServerListController.m
index 6edd151..a2f7258 100644
--- a/Source/Classes/MUFavouriteServerListController.m
+++ b/Source/Classes/MUFavouriteServerListController.m
@@ -38,6 +38,13 @@
 #import "MUServerRootViewControllerPad.h"
 #import "MUServerCell.h"
 
+@interface MUFavouriteServerListController () {
+    NSMutableArray     *_favouriteServers;
+    BOOL               _editMode;
+    MUFavouriteServer  *_editedServer;
+}
+@end
+
 @implementation MUFavouriteServerListController
 
 #pragma mark -
diff --git a/Source/Classes/MULanServerListController.h b/Source/Classes/MULanServerListController.h
index 54c020f..d6e30c5 100644
--- a/Source/Classes/MULanServerListController.h
+++ b/Source/Classes/MULanServerListController.h
@@ -30,12 +30,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MULanServerListController : UITableViewController {
-	NSNetServiceBrowser *_browser;
-	NSMutableArray *_netServices;
-}
-
+@interface MULanServerListController : UITableViewController
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MULanServerListController.m b/Source/Classes/MULanServerListController.m
index ff5832a..fd4be10 100644
--- a/Source/Classes/MULanServerListController.m
+++ b/Source/Classes/MULanServerListController.m
@@ -38,6 +38,11 @@ static NSInteger NetServiceAlphabeticalSort(id arg1, id arg2, void *reverse) {
 	}
 } 
 
+@interface MULanServerListController () {
+    NSNetServiceBrowser  *_browser;
+    NSMutableArray       *_netServices;
+}
+@end
 
 @implementation MULanServerListController
 
diff --git a/Source/Classes/MULogEntry.h b/Source/Classes/MULogEntry.h
index bb54ac6..582a23c 100644
--- a/Source/Classes/MULogEntry.h
+++ b/Source/Classes/MULogEntry.h
@@ -31,15 +31,9 @@
 #import <Foundation/Foundation.h>
 
 
-@interface MULogEntry : NSObject {
-	NSDate *_date;
-	NSString *_text;
-}
-
+@interface MULogEntry : NSObject
 - (id) initWithText:(NSString *)text;
 - (void) dealloc;
-
 - (NSDate *) date;
 - (NSString *) text;
-
 @end
diff --git a/Source/Classes/MULogEntry.m b/Source/Classes/MULogEntry.m
index 1496989..0bc6a6e 100644
--- a/Source/Classes/MULogEntry.m
+++ b/Source/Classes/MULogEntry.m
@@ -30,6 +30,11 @@
 
 #import "MULogEntry.h"
 
+@interface MULogEntry () {
+    NSDate    *_date;
+    NSString  *_text;
+}
+@end
 
 @implementation MULogEntry
 
diff --git a/Source/Classes/MULogViewController.h b/Source/Classes/MULogViewController.h
index d1b3e2b..37a8745 100644
--- a/Source/Classes/MULogViewController.h
+++ b/Source/Classes/MULogViewController.h
@@ -33,13 +33,7 @@
 #import <MumbleKit/MKServerModel.h>
 
 
-@interface MULogViewController : UITableViewController {
-	NSMutableArray *_logEntries;
-	MKServerModel *_serverModel;
-	NSDateFormatter *_dateFormatter;
-}
-
+@interface MULogViewController : UITableViewController
 - (id) initWithServerModel:(MKServerModel *)serverModel;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MULogViewController.m b/Source/Classes/MULogViewController.m
index fd38ce6..4060e6f 100644
--- a/Source/Classes/MULogViewController.m
+++ b/Source/Classes/MULogViewController.m
@@ -31,6 +31,13 @@
 #import "MULogViewController.h"
 #import "MULogEntry.h"
 
+@interface MULogViewController () {
+    NSMutableArray   *_logEntries;
+    MKServerModel    *_serverModel;
+    NSDateFormatter  *_dateFormatter;
+}
+@end
+
 @implementation MULogViewController
 
 - (id) initWithServerModel:(MKServerModel *)serverModel {
diff --git a/Source/Classes/MUPreferencesViewController.h b/Source/Classes/MUPreferencesViewController.h
index 6108d02..8c4dda9 100644
--- a/Source/Classes/MUPreferencesViewController.h
+++ b/Source/Classes/MUPreferencesViewController.h
@@ -28,12 +28,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <UIKit/UIKit.h>
-
-
 @interface MUPreferencesViewController : UITableViewController
-
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUPreferencesViewController.m b/Source/Classes/MUPreferencesViewController.m
index 6194bda..1df960c 100644
--- a/Source/Classes/MUPreferencesViewController.m
+++ b/Source/Classes/MUPreferencesViewController.m
@@ -37,7 +37,7 @@
 
 #import <MumbleKit/MKCertificate.h>
 
-@interface MUPreferencesViewController (Private)
+@interface MUPreferencesViewController ()
 - (void) audioVolumeChanged:(UISlider *)volumeSlider;
 - (void) audioDuckingChanged:(UISwitch *)duckSwitch;
 - (void) forceTCPChanged:(UISwitch *)tcpSwitch;
diff --git a/Source/Classes/MUPublicServerList.h b/Source/Classes/MUPublicServerList.h
index 749dcfa..dc340a0 100644
--- a/Source/Classes/MUPublicServerList.h
+++ b/Source/Classes/MUPublicServerList.h
@@ -37,23 +37,7 @@
 - (void) publicServerListFailedLoading:(NSError *)error;
 @end
 
-@interface MUPublicServerList : NSObject <NSXMLParserDelegate> {
-	NSURLConnection               *_conn;
-	NSMutableData                 *_buf;
-
-	NSMutableDictionary           *_continentCountries;
-	NSMutableDictionary           *_countryServers;
-
-	NSDictionary                  *_continentNames;
-	NSDictionary                  *_countryNames;
-
-	NSMutableArray                *_modelContinents;
-	NSMutableArray                *_modelCountries;
-
-	BOOL                          _loadCompleted;
-	id<PublicServerListDelegate>  _delegate;
-}
-
+@interface MUPublicServerList : NSObject <NSXMLParserDelegate> 
 - (id) init;
 - (void) dealloc;
 
@@ -67,5 +51,4 @@
 - (NSString *) continentNameAtIndex:(NSInteger)index;
 - (NSInteger) numberOfCountriesAtContinentIndex:(NSInteger)index;
 - (NSDictionary *) countryAtIndexPath:(NSIndexPath *)indexPath;
-
 @end
diff --git a/Source/Classes/MUPublicServerList.m b/Source/Classes/MUPublicServerList.m
index 2f5521b..6f898e6 100644
--- a/Source/Classes/MUPublicServerList.m
+++ b/Source/Classes/MUPublicServerList.m
@@ -31,6 +31,24 @@
 #import "MUPublicServerList.h"
 #import <MumbleKit/MKServices.h>
 
+@interface MUPublicServerList () {
+    NSURLConnection               *_conn;
+    NSMutableData                 *_buf;
+
+    NSMutableDictionary           *_continentCountries;
+    NSMutableDictionary           *_countryServers;
+
+    NSDictionary                  *_continentNames;
+    NSDictionary                  *_countryNames;
+
+    NSMutableArray                *_modelContinents;
+    NSMutableArray                *_modelCountries;
+
+    BOOL                          _loadCompleted;
+    id<PublicServerListDelegate>  _delegate;
+}
+@end
+
 @implementation MUPublicServerList
 
 - (id) init {
diff --git a/Source/Classes/MUPublicServerListController.h b/Source/Classes/MUPublicServerListController.h
index 755e1e1..345d575 100644
--- a/Source/Classes/MUPublicServerListController.h
+++ b/Source/Classes/MUPublicServerListController.h
@@ -30,12 +30,7 @@
 
 #import "MUPublicServerList.h"
 
-@interface MUPublicServerListController : UITableViewController <PublicServerListDelegate> {
-	UIActivityIndicatorView  *_activityIndicator;
-	MUPublicServerList         *_serverList;
-}
-
+@interface MUPublicServerListController : UITableViewController <PublicServerListDelegate>
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUPublicServerListController.m b/Source/Classes/MUPublicServerListController.m
index 06fad87..0dd1702 100644
--- a/Source/Classes/MUPublicServerListController.m
+++ b/Source/Classes/MUPublicServerListController.m
@@ -32,6 +32,12 @@
 #import "MUPublicServerListController.h"
 #import "MUCountryServerListController.h"
 
+@interface MUPublicServerListController () {
+    UIActivityIndicatorView   *_activityIndicator;
+    MUPublicServerList        *_serverList;
+}
+@end
+
 @implementation MUPublicServerListController
 
 - (id) init {
diff --git a/Source/Classes/MUServerCell.h b/Source/Classes/MUServerCell.h
index c186b57..d0ac056 100644
--- a/Source/Classes/MUServerCell.h
+++ b/Source/Classes/MUServerCell.h
@@ -32,14 +32,7 @@
 
 @class MUFavouriteServer;
 
-@interface MUServerCell : UITableViewCell <MKServerPingerDelegate> {
-    NSString        *_displayname;
-    NSString        *_hostname;
-    NSString        *_port;
-    NSString        *_username;
-    MKServerPinger  *_pinger;
-}
-
+@interface MUServerCell : UITableViewCell <MKServerPingerDelegate>
 + (NSString *) reuseIdentifier;
 
 - (id) init;
diff --git a/Source/Classes/MUServerCell.m b/Source/Classes/MUServerCell.m
index 371d655..3ddd913 100644
--- a/Source/Classes/MUServerCell.m
+++ b/Source/Classes/MUServerCell.m
@@ -31,7 +31,13 @@
 #import "MUServerCell.h"
 #import "MUFavouriteServer.h"
 
-@interface MUServerCell (Private)
+@interface MUServerCell () {
+    NSString        *_displayname;
+    NSString        *_hostname;
+    NSString        *_port;
+    NSString        *_username;
+    MKServerPinger  *_pinger;
+}
 - (UIImage *) drawPingImageWithPingValue:(NSUInteger)pingMs andSize:(CGSize)sz;
 @end
 
diff --git a/Source/Classes/MUServerCertificateTrustViewController.h b/Source/Classes/MUServerCertificateTrustViewController.h
index 92c7811..a5b30cb 100644
--- a/Source/Classes/MUServerCertificateTrustViewController.h
+++ b/Source/Classes/MUServerCertificateTrustViewController.h
@@ -32,11 +32,7 @@
 
 @class MKConnection;
 
-@interface MUServerCertificateTrustViewController : MUCertificateViewController {
-	MKConnection  *_conn;
-}
-
+@interface MUServerCertificateTrustViewController : MUCertificateViewController
 - (id) initWithConnection:(MKConnection *)conn;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUServerCertificateTrustViewController.m b/Source/Classes/MUServerCertificateTrustViewController.m
index b883abc..3b7ebfd 100644
--- a/Source/Classes/MUServerCertificateTrustViewController.m
+++ b/Source/Classes/MUServerCertificateTrustViewController.m
@@ -34,6 +34,11 @@
 #import "MUServerCertificateTrustViewController.h"
 #import "MUDatabase.h"
 
+@interface MUServerCertificateTrustViewController () {
+    MKConnection  *_conn;
+}
+@end
+
 // This is the modal view controller that's shown to the user
 // when iOS doesn't trsut the certificate chain of the server,
 // and the user picks "Show Certificates"
@@ -41,7 +46,6 @@
 @implementation MUServerCertificateTrustViewController
 
 - (id) initWithConnection:(MKConnection *)conn {
-	NSArray *peerCerts = [conn peerCertificates];
 	if (self = [super initWithCertificates:[conn peerCertificates]]) {
 		_conn = conn;
 	}
diff --git a/Source/Classes/MUServerRootViewController.h b/Source/Classes/MUServerRootViewController.h
index 24acfd4..a90550b 100644
--- a/Source/Classes/MUServerRootViewController.h
+++ b/Source/Classes/MUServerRootViewController.h
@@ -37,22 +37,7 @@
 
 @class MUServerConnectionViewController;
 
-@interface MUServerRootViewController : UITableViewController <MKConnectionDelegate> {
-    MKConnection                    *_connection;
-    MKServerModel                   *_model;
-    NSMutableArray                  *_channelUsers;
-    MKChannel                       *_currentChannel;
-
-    NSString                        *_hostname;
-    NSUInteger                      _port;
-    NSString                        *_username;
-    NSString                        *_password;
-
-    BOOL                            _pttState;
-    MUServerConnectionViewController  *_progressController;
-}
-
+@interface MUServerRootViewController : UITableViewController <MKConnectionDelegate>
 - (id) initWithHostname:(NSString *)host port:(NSUInteger)port username:(NSString *)username password:(NSString *)password;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUServerRootViewController.m b/Source/Classes/MUServerRootViewController.m
index 339fdeb..bcc4380 100644
--- a/Source/Classes/MUServerRootViewController.m
+++ b/Source/Classes/MUServerRootViewController.m
@@ -43,7 +43,20 @@
 #import "MUServerCertificateTrustViewController.h"
 #import "MUChannelNavigationViewController.h"
 
-@interface MUServerRootViewController (Private)
+@interface MUServerRootViewController () {
+    MKConnection                    *_connection;
+    MKServerModel                   *_model;
+    NSMutableArray                  *_channelUsers;
+    MKChannel                       *_currentChannel;
+
+    NSString                        *_hostname;
+    NSUInteger                      _port;
+    NSString                        *_username;
+    NSString                        *_password;
+
+    BOOL                            _pttState;
+    MUServerConnectionViewController  *_progressController;
+}
 - (void) togglePushToTalk;
 - (UIView *) stateAccessoryViewForUser:(MKUser *)user;
 @end
diff --git a/Source/Classes/MUServerRootViewControllerPad.h b/Source/Classes/MUServerRootViewControllerPad.h
index 1adc995..12ba34a 100644
--- a/Source/Classes/MUServerRootViewControllerPad.h
+++ b/Source/Classes/MUServerRootViewControllerPad.h
@@ -37,18 +37,7 @@
 
 @class MUServerConnectionViewController;
 
-@interface MUServerRootViewControllerPad : UITableViewController <MKConnectionDelegate> {
-	MKConnection                    *_connection;
-	MKServerModel                   *_model;
-	NSMutableArray                  *_channelUsers;
-	MKChannel                       *_currentChannel;
-	NSString                        *_username;
-	NSString                        *_password;
-	BOOL                            _pttState;
-	MUServerConnectionViewController  *_progressController;
-}
-
+@interface MUServerRootViewControllerPad : UITableViewController <MKConnectionDelegate>
 - (id) initWithHostname:(NSString *)host port:(NSUInteger)port username:(NSString *)username password:(NSString *)password;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUServerRootViewControllerPad.m b/Source/Classes/MUServerRootViewControllerPad.m
index 51b9731..0da3bd7 100644
--- a/Source/Classes/MUServerRootViewControllerPad.m
+++ b/Source/Classes/MUServerRootViewControllerPad.m
@@ -43,7 +43,16 @@
 #import "MUServerCertificateTrustViewController.h"
 #import "MUChannelNavigationViewController.h"
 
-@interface MUServerRootViewControllerPad (Private)
+@interface MUServerRootViewControllerPad () {
+    MKConnection                      *_connection;
+	MKServerModel                     *_model;
+	NSMutableArray                    *_channelUsers;
+	MKChannel                         *_currentChannel;
+	NSString                          *_username;
+	NSString                          *_password;
+	BOOL                              _pttState;
+	MUServerConnectionViewController  *_progressController;
+}
 - (void) togglePushToTalk;
 - (UIView *) stateAccessoryViewForUser:(MKUser *)user;
 @end
diff --git a/Source/Classes/MUTableViewTextFieldCell.h b/Source/Classes/MUTableViewTextFieldCell.h
index dd4085c..f9687b7 100644
--- a/Source/Classes/MUTableViewTextFieldCell.h
+++ b/Source/Classes/MUTableViewTextFieldCell.h
@@ -30,11 +30,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MUTableViewTextFieldCell : UITableViewCell <UITextInputTraits, UITextFieldDelegate> {
-	UILabel *_label;
-	UITextField *_textField;
-	SEL _valueChangedAction;
-}
+@interface MUTableViewTextFieldCell : UITableViewCell <UITextInputTraits, UITextFieldDelegate>
 
 - (id) initWithReuseIdentifier:(NSString *)reuseIdentifier;
 - (void) dealloc;
diff --git a/Source/Classes/MUTableViewTextFieldCell.m b/Source/Classes/MUTableViewTextFieldCell.m
index d78129c..8cc9655 100644
--- a/Source/Classes/MUTableViewTextFieldCell.m
+++ b/Source/Classes/MUTableViewTextFieldCell.m
@@ -30,6 +30,13 @@
 
 #import "MUTableViewTextFieldCell.h"
 
+@interface MUTableViewTextFieldCell () {
+    UILabel      *_label;
+    UITextField  *_textField;
+    SEL          _valueChangedAction;
+}
+@end
+
 @implementation MUTableViewTextFieldCell
 
 - (id) initWithReuseIdentifier:(NSString *)reuseIdentifier {
diff --git a/Source/Classes/MUVersionChecker.h b/Source/Classes/MUVersionChecker.h
index 0496460..61bf687 100644
--- a/Source/Classes/MUVersionChecker.h
+++ b/Source/Classes/MUVersionChecker.h
@@ -30,12 +30,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface MUVersionChecker : NSObject {
-	NSURLConnection *_conn;
-	NSMutableData   *_buf;
-}
-
+@interface MUVersionChecker : NSObject
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUVersionChecker.m b/Source/Classes/MUVersionChecker.m
index 83cd7a9..ec1c4a6 100644
--- a/Source/Classes/MUVersionChecker.m
+++ b/Source/Classes/MUVersionChecker.m
@@ -31,7 +31,10 @@
 #import "MUApplication.h"
 #import "MUVersionChecker.h"
 
-@interface MUVersionChecker (Private)
+@interface MUVersionChecker () {
+    NSURLConnection *_conn;
+	NSMutableData   *_buf;
+}
 - (void) connection:(NSURLConnection *)conn didReceiveData:(NSData *)data;
 - (void) connection:(NSURLConnection *)conn didFailWithError:(NSError *)error;
 - (void) connectionDidFinishLoading:(NSURLConnection *)conn;
diff --git a/Source/Classes/MUWelcomeScreenPad.h b/Source/Classes/MUWelcomeScreenPad.h
index 77e7568..377fd0e 100644
--- a/Source/Classes/MUWelcomeScreenPad.h
+++ b/Source/Classes/MUWelcomeScreenPad.h
@@ -28,16 +28,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-@interface MUWelcomeScreenPad : UITableViewController <UIPopoverControllerDelegate> {
-	UIAlertView *_aboutView;
-	NSInteger _aboutWebsiteButton;
-	NSInteger _aboutContribButton;
-	NSInteger _aboutLegalButton;
-	
-	UIPopoverController *_preferencesPopover;
-}
-
+@interface MUWelcomeScreenPad : UITableViewController <UIPopoverControllerDelegate> 
 - (id) init;
 - (void) dealloc;
-
 @end
diff --git a/Source/Classes/MUWelcomeScreenPad.m b/Source/Classes/MUWelcomeScreenPad.m
index 0dfa9c1..5d1ed9a 100644
--- a/Source/Classes/MUWelcomeScreenPad.m
+++ b/Source/Classes/MUWelcomeScreenPad.m
@@ -38,7 +38,13 @@
 #import "MUAboutViewController.h"
 
 
-@interface MUWelcomeScreenPad (Private)
+@interface MUWelcomeScreenPad () {
+    UIAlertView          *_aboutView;
+    NSInteger            _aboutWebsiteButton;
+    NSInteger            _aboutContribButton;
+    NSInteger            _aboutLegalButton;
+    UIPopoverController  *_preferencesPopover;
+}
 - (void) presentAboutDialog;
 @end
 
diff --git a/Source/Classes/MUWelcomeScreenPhone.h b/Source/Classes/MUWelcomeScreenPhone.h
index 28377de..a35f92a 100644
--- a/Source/Classes/MUWelcomeScreenPhone.h
+++ b/Source/Classes/MUWelcomeScreenPhone.h
@@ -28,14 +28,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-@interface MUWelcomeScreenPhone : UITableViewController {
-	UIAlertView *_aboutView;
-	NSInteger _aboutWebsiteButton;
-	NSInteger _aboutContribButton;
-	NSInteger _aboutLegalButton;
-}
-
+@interface MUWelcomeScreenPhone : UITableViewController
 - (id) init;
 - (void) dealloc;
-
-@end
+@end
\ No newline at end of file
diff --git a/Source/Classes/MUWelcomeScreenPhone.m b/Source/Classes/MUWelcomeScreenPhone.m
index 6a79500..0d0e7d1 100644
--- a/Source/Classes/MUWelcomeScreenPhone.m
+++ b/Source/Classes/MUWelcomeScreenPhone.m
@@ -38,7 +38,12 @@
 #import "MUAboutViewController.h"
 
 
-@interface MUWelcomeScreenPhone (Private)
+@interface MUWelcomeScreenPhone () {
+    UIAlertView  *_aboutView;
+    NSInteger    _aboutWebsiteButton;
+    NSInteger    _aboutContribButton;
+    NSInteger    _aboutLegalButton;
+}
 - (void) presentAboutDialog;
 @end