diff --git a/examples/inter_argument_order.cpp b/examples/inter_argument_order.cpp
index 8056523..6d570e1 100644
--- a/examples/inter_argument_order.cpp
+++ b/examples/inter_argument_order.cpp
@@ -17,7 +17,7 @@ int main(int argc, char **argv) {
     // Standard parsing lines (copy and paste in)
     try {
         app.parse(argc, argv);
-    } catch (const CLI::ParseError &e) {
+    } catch(const CLI::ParseError &e) {
         return app.exit(e);
     }
 
@@ -25,7 +25,7 @@ int main(int argc, char **argv) {
     std::reverse(std::begin(foos), std::end(foos));
     std::reverse(std::begin(bars), std::end(bars));
 
-	std::vector<std::tuple<std::string,int>> keyval;
+    std::vector<std::tuple<std::string, int>> keyval;
     for(auto option : app.parse_order()) {
         if(option == foo) {
             keyval.emplace_back("foo", foos.back());
@@ -41,10 +41,8 @@ int main(int argc, char **argv) {
     std::string name;
     int value;
 
-    for(auto& tuple : keyval) {
+    for(auto &tuple : keyval) {
         std::tie(name, value) = tuple;
         std::cout << name << " : " << value << std::endl;
     }
 }
-
-
diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp
index d5ed30d..f4729cd 100644
--- a/include/CLI/App.hpp
+++ b/include/CLI/App.hpp
@@ -80,9 +80,9 @@ class App {
     ///
     /// This is faster and cleaner than storing just a list of strings and reparsing. This may contain the -- separator.
     missing_t missing_;
-    
+
     /// This is a list of pointers to options with the orignal parse order
-    std::vector<Option*> parse_order_;
+    std::vector<Option *> parse_order_;
 
     ///@}
     /// @name Subcommands
@@ -713,11 +713,9 @@ class App {
 
         return local_name == name_to_check;
     }
-    
+
     /// This gets a vector of pointers with the original parse order
-    const std::vector<Option*> &parse_order() const {
-        return parse_order_;
-    }
+    const std::vector<Option *> &parse_order() const { return parse_order_; }
 
     ///@}
 
diff --git a/tests/AppTest.cpp b/tests/AppTest.cpp
index 283054d..75d3a45 100644
--- a/tests/AppTest.cpp
+++ b/tests/AppTest.cpp
@@ -503,19 +503,18 @@ TEST_F(TApp, VectorFancyOpts) {
 
 TEST_F(TApp, OriginalOrder) {
     std::vector<int> st1;
-    CLI::Option* op1 = app.add_option("-a", st1);
+    CLI::Option *op1 = app.add_option("-a", st1);
     std::vector<int> st2;
-    CLI::Option* op2 = app.add_option("-b", st2);
-    
+    CLI::Option *op2 = app.add_option("-b", st2);
+
     args = {"-a", "1", "-b", "2", "-a3", "-a", "4"};
-    
+
     run();
-    
-    EXPECT_EQ(st1, std::vector<int>({1,3,4}));
+
+    EXPECT_EQ(st1, std::vector<int>({1, 3, 4}));
     EXPECT_EQ(st2, std::vector<int>({2}));
-    
-    EXPECT_EQ(app.parse_order(), std::vector<CLI::Option*>({op1, op2, op1, op1}));
-    
+
+    EXPECT_EQ(app.parse_order(), std::vector<CLI::Option *>({op1, op2, op1, op1}));
 }
 
 TEST_F(TApp, RequiresFlags) {