diff --git a/imgui-binding/src/main/java/imgui/ImFont.java b/imgui-binding/src/main/java/imgui/ImFont.java
index c7ddc03..f712a2f 100644
--- a/imgui-binding/src/main/java/imgui/ImFont.java
+++ b/imgui-binding/src/main/java/imgui/ImFont.java
@@ -44,7 +44,7 @@ public final class ImFont implements ImDestroyable {
 
     private native long nCreate(); /*
         ImFont* imFont = new ImFont();
-        return (long)(intptr_t)imFont;
+        return (intptr_t)imFont;
     */
 
     private native void nDestroy(long ptr); /*
@@ -87,7 +87,7 @@ public final class ImFont implements ImDestroyable {
     }
 
     private native long nGetFallbackGlyphPtr(); /*
-        return (long)(intptr_t)IM_FONT->FallbackGlyph;
+        return (intptr_t)IM_FONT->FallbackGlyph;
     */
 
     /**
diff --git a/imgui-binding/src/main/java/imgui/ImFontAtlas.java b/imgui-binding/src/main/java/imgui/ImFontAtlas.java
index 2972e12..224c4e3 100644
--- a/imgui-binding/src/main/java/imgui/ImFontAtlas.java
+++ b/imgui-binding/src/main/java/imgui/ImFontAtlas.java
@@ -59,7 +59,7 @@ public final class ImFontAtlas implements ImDestroyable {
 
     private native long nCreate(); /*
         ImFontAtlas* imFontAtlas = new ImFontAtlas();
-        return (long)(intptr_t)imFontAtlas;
+        return (intptr_t)imFontAtlas;
     */
 
     private native void nDestroy(long ptr); /*
@@ -71,7 +71,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFont(long imFontConfigPtr); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFont((ImFontConfig*)imFontConfigPtr);
+        return (intptr_t)IM_FONT_ATLAS->AddFont((ImFontConfig*)imFontConfigPtr);
     */
 
     public ImFont addFontDefault() {
@@ -79,7 +79,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontDefault(); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontDefault();
+        return (intptr_t)IM_FONT_ATLAS->AddFontDefault();
     */
 
     public ImFont addFontDefault(final ImFontConfig imFontConfig) {
@@ -87,7 +87,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontDefault(long imFontConfigPtr); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontDefault((ImFontConfig*)imFontConfigPtr);
+        return (intptr_t)IM_FONT_ATLAS->AddFontDefault((ImFontConfig*)imFontConfigPtr);
     */
 
     public ImFont addFontFromFileTTF(final String filename, final float sizePixels) {
@@ -95,7 +95,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromFileTTF(String filename, float sizePixels); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels);
     */
 
     public ImFont addFontFromFileTTF(final String filename, final float sizePixels, final ImFontConfig imFontConfig) {
@@ -103,7 +103,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromFileTTF(String filename, float sizePixels, long imFontConfigPtr); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels, (ImFontConfig*)imFontConfigPtr);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels, (ImFontConfig*)imFontConfigPtr);
     */
 
     public ImFont addFontFromFileTTF(final String filename, final float sizePixels, final short[] glyphRanges) {
@@ -111,7 +111,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromFileTTF(String filename, float sizePixels, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
     */
 
     public ImFont addFontFromFileTTF(final String filename, final float sizePixels, final ImFontConfig imFontConfig, final short[] glyphRanges) {
@@ -119,7 +119,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromFileTTF(String filename, float sizePixels, long imFontConfigPtr, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromFileTTF(filename, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -131,7 +131,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryTTF(byte[] fontData, int fontSize, float sizePixels); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels);
     */
 
 
@@ -144,7 +144,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryTTF(byte[] fontData, int fontSize, float sizePixels, long imFontConfigPtr); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr);
     */
 
     /**
@@ -156,7 +156,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryTTF(byte[] fontData, int fontSize, float sizePixels, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -168,7 +168,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryTTF(byte[] fontData, int fontSize, float sizePixels, long imFontConfigPtr, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -179,7 +179,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedTTF(byte[] compressedFontData, int fontSize, float sizePixels); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels);
     */
 
     /**
@@ -190,7 +190,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedTTF(byte[] compressedFontData, int fontSize, float sizePixels, long imFontConfigPtr); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr);
     */
 
     /**
@@ -201,7 +201,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedTTF(byte[] compressedFontData, int fontSize, float sizePixels, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -212,7 +212,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedTTF(byte[] compressedFontData, int fontSize, float sizePixels, long imFontConfigPtr, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], fontSize, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -223,7 +223,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedBase85TTF(String compressedFontDataBase85, float sizePixels); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels);
     */
 
     /**
@@ -234,7 +234,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedBase85TTF(String compressedFontDataBase85, float sizePixels, long imFontConfigPtr); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, (ImFontConfig*)imFontConfigPtr);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, (ImFontConfig*)imFontConfigPtr);
     */
 
     /**
@@ -245,7 +245,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedBase85TTF(String compressedFontDataBase85, float sizePixels, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, NULL, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -256,7 +256,7 @@ public final class ImFontAtlas implements ImDestroyable {
     }
 
     private native long nAddFontFromMemoryCompressedBase85TTF(String compressedFontDataBase85, float sizePixels, long imFontConfigPtr, short[] glyphRanges); /*
-        return (long)(intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
+        return (intptr_t)IM_FONT_ATLAS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, (ImFontConfig*)imFontConfigPtr, (ImWchar*)&glyphRanges[0]);
     */
 
     /**
@@ -512,7 +512,7 @@ public final class ImFontAtlas implements ImDestroyable {
      * It is passed back to you during rendering via the ImDrawCmd structure.
      */
     public native int getTexID(); /*
-        return (int)(long)(intptr_t)(void*)IM_FONT_ATLAS->TexID;
+        return (int)(intptr_t)(void*)IM_FONT_ATLAS->TexID;
     */
 
     /**
diff --git a/imgui-binding/src/main/java/imgui/ImFontConfig.java b/imgui-binding/src/main/java/imgui/ImFontConfig.java
index 6aaea85..c6e5a4f 100644
--- a/imgui-binding/src/main/java/imgui/ImFontConfig.java
+++ b/imgui-binding/src/main/java/imgui/ImFontConfig.java
@@ -42,7 +42,7 @@ public final class ImFontConfig implements ImDestroyable {
 
     private native long nCreate(); /*
         ImFontConfig* imFontConfig = new ImFontConfig();
-        return (long)(intptr_t)imFontConfig;
+        return (intptr_t)imFontConfig;
     */
 
     private native void nDestroy(long ptr); /*
diff --git a/imgui-binding/src/main/java/imgui/ImFontGlyph.java b/imgui-binding/src/main/java/imgui/ImFontGlyph.java
index 117ede9..9bd0a48 100644
--- a/imgui-binding/src/main/java/imgui/ImFontGlyph.java
+++ b/imgui-binding/src/main/java/imgui/ImFontGlyph.java
@@ -38,7 +38,7 @@ public final class ImFontGlyph implements ImDestroyable {
 
     private native long nCreate(); /*
         ImFontConfig* imFontConfig = new ImFontConfig();
-        return (long)(intptr_t)imFontConfig;
+        return (intptr_t)imFontConfig;
     */
 
     private native void nDestroy(long ptr); /*
diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java
index d7d1681..0d12502 100644
--- a/imgui-binding/src/main/java/imgui/ImGui.java
+++ b/imgui-binding/src/main/java/imgui/ImGui.java
@@ -157,7 +157,7 @@ public final class ImGui {
     }
 
     private static native long nGetStyle(); /*
-        return (long)(intptr_t)&ImGui::GetStyle();
+        return (intptr_t)&ImGui::GetStyle();
     */
 
     /**
@@ -895,7 +895,7 @@ public final class ImGui {
     }
 
     private static native long nGetFont(); /*
-        return (long)(intptr_t)ImGui::GetFont();
+        return (intptr_t)ImGui::GetFont();
     */
 
     /**
diff --git a/imgui-binding/src/main/java/imgui/ImGuiIO.java b/imgui-binding/src/main/java/imgui/ImGuiIO.java
index af28850..fef192f 100644
--- a/imgui-binding/src/main/java/imgui/ImGuiIO.java
+++ b/imgui-binding/src/main/java/imgui/ImGuiIO.java
@@ -208,7 +208,7 @@ public final class ImGuiIO {
     }
 
     private native long nGetFontsPtr(); /*
-        return (long)(intptr_t)ImGui::GetIO().Fonts;
+        return (intptr_t)ImGui::GetIO().Fonts;
     */
 
     /**
diff --git a/imgui-binding/src/main/java/imgui/ImGuiStyle.java b/imgui-binding/src/main/java/imgui/ImGuiStyle.java
index 0dcb800..ad484f5 100644
--- a/imgui-binding/src/main/java/imgui/ImGuiStyle.java
+++ b/imgui-binding/src/main/java/imgui/ImGuiStyle.java
@@ -43,7 +43,7 @@ public final class ImGuiStyle implements ImDestroyable {
 
     private native long nCreate(); /*
         ImGuiStyle* imGuiStyle = new ImGuiStyle();
-        return (long)(intptr_t)imGuiStyle;
+        return (intptr_t)imGuiStyle;
     */
 
     private native void nDestroy(long ptr); /*