diff --git a/MacPass/MPContextBarViewController.m b/MacPass/MPContextBarViewController.m
index 16c24552..83a47e7e 100644
--- a/MacPass/MPContextBarViewController.m
+++ b/MacPass/MPContextBarViewController.m
@@ -70,7 +70,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
 }
 
 - (void)awakeFromNib {
-  [[self.filterLabelTextField cell] setBackgroundStyle:NSBackgroundStyleRaised];
+  self.filterLabelTextField.cell.backgroundStyle = NSBackgroundStyleRaised;
   //self.historyBar.activeGradient = [[NSGradient alloc] initWithStartingColor:[[NSColor orangeColor] shadowWithLevel:0.2] endingColor:[[NSColor orangeColor] highlightWithLevel:0.2]];
   
   /* Setup Trash Bar color */
@@ -86,18 +86,18 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
   
   /* Setup Filter Bar buttons and menu */
   NSInteger tags[] = { MPEntrySearchTitles, MPEntrySearchUsernames, MPEntrySearchPasswords, MPEntrySearchNotes, MPEntrySearchUrls };
-  NSArray *buttons  = @[self.titleButton, self.usernameButton, self.passwordButton, self.notesButton, self.urlButton ];
-  for(NSUInteger iIndex = 0; iIndex < [buttons count]; iIndex++) {
-    [buttons[iIndex] setAction:@selector(toggleSearchFlags:)];
-    [buttons[iIndex] setTag:tags[iIndex]];
+  NSArray<NSControl *> *buttons  = @[self.titleButton, self.usernameButton, self.passwordButton, self.notesButton, self.urlButton ];
+  for(NSUInteger iIndex = 0; iIndex < buttons.count; iIndex++) {
+    buttons[iIndex].action = @selector(toggleSearchFlags:);
+    buttons[iIndex].tag = tags[iIndex];
   }
   NSInteger specialTags[] = { MPEntrySearchDoublePasswords, MPEntrySearchExpiredEntries };
   NSArray *titles = @[ NSLocalizedString(@"SEARCH_DUPLICATE_PASSWORDS", ""), NSLocalizedString(@"SEARCH_EXPIRED_ENTRIES", "") ];
   NSMenu *specialMenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"CUSTOM_SEARCH_FILTER_MENU", @"Title for menu for custom search filters")];
   [specialMenu addItemWithTitle:NSLocalizedString(@"SELECT_FILTER_WITH_DOTS", "") action:NULL keyEquivalent:@""];
-  [[specialMenu itemAtIndex:0] setEnabled:NO];
-  [[specialMenu itemAtIndex:0] setTag:MPEntrySearchNone];
-  [[specialMenu itemAtIndex:0] setAction:@selector(toggleSearchFlags:)];
+  [specialMenu itemAtIndex:0].enabled = NO;
+  [specialMenu itemAtIndex:0].tag = MPEntrySearchNone;
+  [specialMenu itemAtIndex:0].action = @selector(toggleSearchFlags:);
   for(NSInteger iIndex = 0; iIndex < (sizeof(specialTags)/sizeof(NSInteger)); iIndex++) {
     NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:titles[iIndex] action:@selector(toggleSearchFlags:) keyEquivalent:@""];
     item.tag = specialTags[iIndex];
@@ -146,27 +146,27 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
 
 #pragma mark UI Helper
 - (void)_updateFilterButtons {
-  MPDocument *document = [[self windowController] document];
+  MPDocument *document = self.windowController.document;
   MPEntrySearchFlags currentFlags = document.searchContext.searchFlags;
-  [self.duplicatePasswordsButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags))];
-  [self.notesButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags))];
-  [self.passwordButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags))];
-  [self.titleButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags))];
-  [self.urlButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags))];
-  [self.usernameButton setState:HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags))];
+  self.duplicatePasswordsButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags));
+  self.notesButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags));
+  self.passwordButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags));
+  self.titleButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags));
+  self.urlButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags));
+  self.usernameButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags));
   NSInteger selectedTag = MPEntrySearchNone;
   for(NSMenuItem *item in [[self.specialFilterPopUpButton menu] itemArray]) {
-    MPEntrySearchFlags flag = [item tag];
+    MPEntrySearchFlags flag = item.tag;
     if(flag == MPEntrySearchNone) {
-      [item setState:NSOffState];
-      [item setEnabled:NO];
+      item.state = NSOffState;
+      item.enabled = NO;
     }
     else {
       BOOL isActive = MPIsFlagSetInOptions(flag, currentFlags);
       if(isActive) {
         selectedTag = flag;
       }
-      [item setState:HNHUIStateForBool(isActive)];
+      item.state = HNHUIStateForBool(isActive);
     }
   }
   [self.specialFilterPopUpButton selectItemWithTag:selectedTag];