diff --git a/WanaKanaSharp/Utility/Trie.cs b/WanaKanaSharp/Utility/Trie.cs
index 5d5ad7f..1d3c564 100644
--- a/WanaKanaSharp/Utility/Trie.cs
+++ b/WanaKanaSharp/Utility/Trie.cs
@@ -163,12 +163,12 @@ public void Remove(params TKey[] keys)
                 }
             }
 
-            public void Traverse(Action<Node> action, Int32 maxDepth = -1)
+            public void Traverse(Action<Node> action, int maxDepth = -1)
             {
                 Traverse(action, 0, maxDepth);
             }
 
-            public void TraverseChildren(Action<Node> action, Int32 maxDepth = 0)
+            public void TraverseChildren(Action<Node> action, int maxDepth = 0)
             {
                 foreach (var child in this)
                 {
@@ -176,7 +176,7 @@ public void TraverseChildren(Action<Node> action, Int32 maxDepth = 0)
                 }
             }
 
-            void Traverse(Action<Node> action, Int32 currentDepth, Int32 maxDepth)
+            void Traverse(Action<Node> action, int currentDepth, int maxDepth)
             {
                 action(this);
 
diff --git a/WanaKanaSharp/WanaKanaSharp.cs b/WanaKanaSharp/WanaKanaSharp.cs
index 30f8484..06bdebb 100644
--- a/WanaKanaSharp/WanaKanaSharp.cs
+++ b/WanaKanaSharp/WanaKanaSharp.cs
@@ -235,10 +235,10 @@ public static string[] Tokenize(string input, bool compact = false, bool detaile
 
             var tokens = new List<string>();
 
-            Int32 position = 0;
+            int position = 0;
             do
             {
-                Int32 start = position;
+                int start = position;
                 TokenType type = GetTokenType(input[position]);
 
                 do