diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m
index 6983dcbb..a609de0a 100644
--- a/MacPass/MPAutotypeDaemon.m
+++ b/MacPass/MPAutotypeDaemon.m
@@ -158,7 +158,7 @@ static MPAutotypeDaemon *_sharedInstance;
   MPAutotypeContext *context = [self _autotypeContextForDocuments:documents forWindowTitle:self.targetWindowTitle preferredEntry:entryOrNil];
   /* TODO: that's popping up if the mulit seleciton dialog goes up! */
   if(!entryOrNil) {
-    NSImage *appIcon = [[NSApplication sharedApplication] applicationIconImage];
+    NSImage *appIcon = [NSApplication sharedApplication].applicationIconImage;
     NSString *label = context ? NSLocalizedString(@"AUTOTYPE_OVERLAY_SINGLE_MATCH", "") : NSLocalizedString(@"AUTOTYPE_OVERLAY_NO_MATCH", "");
     [[MPOverlayWindowController sharedController] displayOverlayImage:appIcon label:label atView:nil];
   }
@@ -210,7 +210,7 @@ static MPAutotypeDaemon *_sharedInstance;
   }
   if([self _orderApplicationToFront:self.targetPID]) {
     /* Sleep a bit after the app was activated */
-    /* TODO - we can use a saver way and use a notification to chekc if the app actally was activated */
+    /* TODO - we can use a saver way and use a notification to check if the app actally was activated */
     usleep(1 * NSEC_PER_MSEC);
   }
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
diff --git a/MacPass/MPPasteBoardController.h b/MacPass/MPPasteBoardController.h
index 5b237484..a2728a8f 100644
--- a/MacPass/MPPasteBoardController.h
+++ b/MacPass/MPPasteBoardController.h
@@ -21,10 +21,13 @@ FOUNDATION_EXPORT NSString *const MPPasteBoardControllerDidCopyObjects;
  */
 FOUNDATION_EXPORT NSString *const MPPasteBoardControllerDidClearClipboard;
 
-/*
+/**
  This time sets the time interval after which a copied entry should be purged from the pasteboard
  */
 @property (assign, nonatomic) NSTimeInterval clearTimeout;
+/**
+ *  If set to YES, MacPass will clear the pastboard when it quits.
+ */
 @property (assign, nonatomic) BOOL clearPasteboardOnShutdown;
 
 + (MPPasteBoardController *)defaultController;
diff --git a/MacPass/MPPasteBoardController.m b/MacPass/MPPasteBoardController.m
index bf8dfb35..800e38d9 100644
--- a/MacPass/MPPasteBoardController.m
+++ b/MacPass/MPPasteBoardController.m
@@ -65,9 +65,9 @@ NSString *const MPPasteBoardControllerDidClearClipboard = @"com.hicknhack.macpas
 
 - (void)stashObjects {
   self.stashedObjects = [NSMutableArray array];
-  for (NSPasteboardItem *item in [[NSPasteboard generalPasteboard] pasteboardItems]) {
+  for (NSPasteboardItem *item in [NSPasteboard generalPasteboard].pasteboardItems) {
     NSPasteboardItem *newItem = [[NSPasteboardItem alloc] init];
-    for (NSString *type in [item types]) {
+    for (NSString *type in item.types) {
       NSData *data = [[item dataForType:type] mutableCopy];
       if (data) {
         [newItem setData:data forType:type];
diff --git a/MacPass/MPTreeDelegate.m b/MacPass/MPTreeDelegate.m
index 7073cf23..f94fa9d4 100644
--- a/MacPass/MPTreeDelegate.m
+++ b/MacPass/MPTreeDelegate.m
@@ -33,7 +33,7 @@
 }
 
 - (BOOL)shouldEditTree:(KPKTree *)tree {
-  return (NO == self.document.isReadOnly);
+  return !self.document.isReadOnly;
 }
 
 - (NSUndoManager *)undoManagerForTree:(KPKTree *)tree {