diff --git a/HTMLKit/HTMLDocument.m b/HTMLKit/HTMLDocument.m
index 9b8d2b3..a4990dc 100644
--- a/HTMLKit/HTMLDocument.m
+++ b/HTMLKit/HTMLDocument.m
@@ -92,7 +92,7 @@
 
 - (HTMLElement *)head
 {
-	for (HTMLNode *node in [self nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowElement]) {
+	for (HTMLNode *node in [self nodeIteratorWithShowOptions:HTMLNodeFilterShowElement filter:nil]) {
 		if ([node.asElement.tagName isEqualToString:@"head"]) {
 			return node.asElement;
 		}
@@ -107,7 +107,7 @@
 
 - (HTMLElement *)body
 {
-	for (HTMLNode *node in [self nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowElement]) {
+	for (HTMLNode *node in [self nodeIteratorWithShowOptions:HTMLNodeFilterShowElement filter:nil]) {
 		if ([node.asElement.tagName isEqualToString:@"body"]) {
 			return node.asElement;
 		}
diff --git a/HTMLKit/HTMLNode.h b/HTMLKit/HTMLNode.h
index 27ece82..c681825 100644
--- a/HTMLKit/HTMLNode.h
+++ b/HTMLKit/HTMLNode.h
@@ -116,8 +116,8 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
 - (void)enumerateChildElementsUsingBlock:(void (^)(HTMLElement *element, NSUInteger idx, BOOL *stop))block;
 
 - (HTMLNodeIterator	*)nodeIterator;
-- (HTMLNodeIterator *)nodeIteratorWithFilter:(id<HTMLNodeFilter>)filter
-								showOptions:(HTMLNodeFilterShowOptions)showOptions;
+- (HTMLNodeIterator *)nodeIteratorWithShowOptions:(HTMLNodeFilterShowOptions)showOptions
+										   filter:(id<HTMLNodeFilter>)filter;
 - (NSString *)treeDescription;
 
 @end
diff --git a/HTMLKit/HTMLNode.m b/HTMLKit/HTMLNode.m
index bb75fe1..c4d166f 100644
--- a/HTMLKit/HTMLNode.m
+++ b/HTMLKit/HTMLNode.m
@@ -371,13 +371,13 @@
 
 - (HTMLNodeIterator	*)nodeIterator
 {
-	return [self nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowAll];
+	return [self nodeIteratorWithShowOptions:HTMLNodeFilterShowAll filter:nil];
 }
 
-- (HTMLNodeIterator *)nodeIteratorWithFilter:(id<HTMLNodeFilter>)filter
-								 showOptions:(HTMLNodeFilterShowOptions)showOptions
+- (HTMLNodeIterator *)nodeIteratorWithShowOptions:(HTMLNodeFilterShowOptions)showOptions
+										   filter:(id<HTMLNodeFilter>)filter
 {
-	return [[HTMLNodeIterator alloc] initWithNode:self filter:filter showOptions:showOptions];
+	return [[HTMLNodeIterator alloc] initWithNode:self showOptions:showOptions filter:filter];
 }
 
 #ifndef HTMLKIT_NO_DOM_CHECKS
diff --git a/HTMLKit/HTMLNodeIterator.h b/HTMLKit/HTMLNodeIterator.h
index d6c0cb7..ed8bd2b 100644
--- a/HTMLKit/HTMLNodeIterator.h
+++ b/HTMLKit/HTMLNodeIterator.h
@@ -23,9 +23,8 @@
 - (instancetype)initWithNode:(HTMLNode *)node
 					  filter:(id<HTMLNodeFilter>)filter;
 - (instancetype)initWithNode:(HTMLNode *)node
-					  filter:(id<HTMLNodeFilter>)filter
-				 showOptions:(HTMLNodeFilterShowOptions)showOptions;
-
+				 showOptions:(HTMLNodeFilterShowOptions)showOptions
+					  filter:(id<HTMLNodeFilter>)filter;
 
 - (HTMLNode *)nextNode;
 - (HTMLNode *)previousNode;
diff --git a/HTMLKit/HTMLNodeIterator.m b/HTMLKit/HTMLNodeIterator.m
index 4f93445..a79ae6d 100644
--- a/HTMLKit/HTMLNodeIterator.m
+++ b/HTMLKit/HTMLNodeIterator.m
@@ -39,12 +39,12 @@ typedef NS_ENUM(short, TraverseDirection)
 - (instancetype)initWithNode:(HTMLNode *)node
 					  filter:(id<HTMLNodeFilter>)filter
 {
-	return [self initWithNode:node filter:nil showOptions:HTMLNodeFilterShowAll];
+	return [self initWithNode:node showOptions:HTMLNodeFilterShowAll filter:filter];
 }
 
 - (instancetype)initWithNode:(HTMLNode *)node
-					  filter:(id<HTMLNodeFilter>)filter
 				 showOptions:(HTMLNodeFilterShowOptions)showOptions
+					  filter:(id<HTMLNodeFilter>)filter
 {
 	self = [super init];
 	if (self) {
diff --git a/HTMLKitTests/HTMLKitNodeIteratorTests.m b/HTMLKitTests/HTMLKitNodeIteratorTests.m
index c702e6f..4fadae1 100644
--- a/HTMLKitTests/HTMLKitNodeIteratorTests.m
+++ b/HTMLKitTests/HTMLKitNodeIteratorTests.m
@@ -252,7 +252,7 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowDocument];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowDocument filter:nil];
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"#document"];
 	XCTAssertEqual(result.count, 1);
@@ -264,7 +264,7 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowDocumentType];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowDocumentType filter:nil];
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"html"];
 	XCTAssertEqual(result.count, 1);
@@ -276,7 +276,7 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowComment];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowComment filter:nil];
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"#comment", @"#comment"];
 	XCTAssertEqual(result.count, 2);
@@ -289,7 +289,7 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowText];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowText filter:nil];
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"#text"];
 	XCTAssertEqual(result.count, 1);
@@ -301,7 +301,7 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:nil showOptions:HTMLNodeFilterShowElement];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowElement filter:nil];
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"html", @"div"];
 	XCTAssertEqual(result.count, 2);
@@ -313,8 +313,8 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:nil
-													  showOptions:HTMLNodeFilterShowElement | HTMLNodeFilterShowText];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowElement | HTMLNodeFilterShowText
+													  filter:nil];
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"html", @"#text", @"div"];
 	XCTAssertEqual(result.count, 3);
@@ -327,8 +327,8 @@
 {
 	HTMLDocument *document = self.mixedTree;
 
-	HTMLNodeIterator *iterator = [document nodeIteratorWithFilter:[CommentNodeFilter new]
-													  showOptions:HTMLNodeFilterShowAll];
+	HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowAll
+																filter:[CommentNodeFilter new]];
 
 	NSArray *result = iterator.allObjects;
 	NSArray	*expected = @[@"#comment"];