diff --git a/src/main/java/electrosphere/renderer/OpenGLContext.java b/src/main/java/electrosphere/renderer/OpenGLContext.java
index d79694ce..fe89bf55 100644
--- a/src/main/java/electrosphere/renderer/OpenGLContext.java
+++ b/src/main/java/electrosphere/renderer/OpenGLContext.java
@@ -13,12 +13,12 @@ public class OpenGLContext {
     /**
      * The maximum number of textures supported
      */
-    int maxTextureImageUnits = 0;
+    private int maxTextureImageUnits = 0;
 
     /**
      * The maximum texture size
      */
-    int maxTextureSize = 0;
+    private int maxTextureSize = 0;
 
     /**
      * Constructor
diff --git a/src/main/java/electrosphere/renderer/OpenGLState.java b/src/main/java/electrosphere/renderer/OpenGLState.java
index fe2a03a9..393cef03 100644
--- a/src/main/java/electrosphere/renderer/OpenGLState.java
+++ b/src/main/java/electrosphere/renderer/OpenGLState.java
@@ -29,7 +29,7 @@ public class OpenGLState {
     /**
      * the max texture allowed by the current environment
      */
-    int MAX_TEXTURE_WIDTH;
+    private int MAX_TEXTURE_WIDTH;
     
     /**
      * the current viewport dimensions
@@ -39,58 +39,58 @@ public class OpenGLState {
     /**
      * whether depth test is enabled or not
      */
-    boolean depthTest;
+    private boolean depthTest;
 
     /**
      * the current depth function
      */
-    int depthFunction;
+    private int depthFunction;
 
     /**
      * whether to blend or not
      */
-    boolean blendTest;
+    private boolean blendTest;
 
     /**
      * the current blend func
      * map is (texture unit) -> [sfactor,dfactor]
      */
-    Map<Integer,int[]> blendFuncMap;
+    private Map<Integer,int[]> blendFuncMap;
 
     /**
      * the key that contains the value of glBlendFunc (which would affect all buffers)
      */
-    static final int ALL_BUFFERS_KEY = -1;
+    private static final int ALL_BUFFERS_KEY = -1;
 
     /**
      * the currently active texture
      */
-    int activeTexture;
+    private int activeTexture;
 
     /**
      * Currently bound framebuffer type
      */
-    int framebufferType;
+    private int framebufferType;
 
     /**
      * Pointer for currently bound framebuffer
      */
-    int framebufferPointer;
+    private int framebufferPointer;
 
     /**
      * active shader
      */
-    Shader activeShader;
+    private Shader activeShader;
 
     /**
      * map of texture units and their corresponding texture pointers
      */
-    Map<Integer,Integer> unitToPointerMap;
+    private Map<Integer,Integer> unitToPointerMap;
 
     /**
      * A map of index -> uniform buffer bound to that index
      */
-    Map<Integer,UniformBlockBinding> indexBlockMap;
+    private Map<Integer,UniformBlockBinding> indexBlockMap;
 
 
     /**