diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
index 9fc897fa981a1d..deb45f1d8d6cf5 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
@@ -22,7 +22,7 @@ public enum YogaAlign {
   SPACE_BETWEEN(6),
   SPACE_AROUND(7);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaAlign(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
index 0b0fe25752def5..b6cb1f84759973 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
@@ -16,7 +16,7 @@ public enum YogaDimension {
   WIDTH(0),
   HEIGHT(1);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaDimension(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
index 17f3a37be0991f..29789fcb08b173 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
@@ -17,7 +17,7 @@ public enum YogaDirection {
   LTR(1),
   RTL(2);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaDirection(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
index c4b49a9c120237..b7d416ec287f5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
@@ -16,7 +16,7 @@ public enum YogaDisplay {
   FLEX(0),
   NONE(1);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaDisplay(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
index e75295ea668b25..53677cff22bb7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
@@ -23,7 +23,7 @@ public enum YogaEdge {
   VERTICAL(7),
   ALL(8);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaEdge(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
index c1eaa1e3aeb303..02dad1ed6bc9dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
@@ -15,7 +15,7 @@
 public enum YogaExperimentalFeature {
   WEB_FLEX_BASIS(0);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaExperimentalFeature(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
index 2608fd17260400..19bdd20420d0f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
@@ -18,7 +18,7 @@ public enum YogaFlexDirection {
   ROW(2),
   ROW_REVERSE(3);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaFlexDirection(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
index 34a8922e06a628..283e0b57399897 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
@@ -20,7 +20,7 @@ public enum YogaJustify {
   SPACE_AROUND(4),
   SPACE_EVENLY(5);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaJustify(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
index 7dd5273d48c4f4..d16d98f4be4d54 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
@@ -20,7 +20,7 @@ public enum YogaLogLevel {
   VERBOSE(4),
   FATAL(5);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaLogLevel(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
index bcc7fe1c9c871f..42633fa29a6bc0 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
@@ -17,7 +17,7 @@ public enum YogaMeasureMode {
   EXACTLY(1),
   AT_MOST(2);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaMeasureMode(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 815fd2c344b826..9836f9cac8554a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -33,13 +33,13 @@ public class YogaNode {
   private List<YogaNode> mChildren;
   private YogaMeasureFunction mMeasureFunction;
   private YogaBaselineFunction mBaselineFunction;
-  private long mNativePointer;
+  private final long mNativePointer;
   private Object mData;
 
   /* Those flags needs be in sync with YGJNI.cpp */
-  private final static int MARGIN = 1;
-  private final static int PADDING = 2;
-  private final static int BORDER = 4;
+  private static final int MARGIN = 1;
+  private static final int PADDING = 2;
+  private static final int BORDER = 4;
 
   @DoNotStrip
   private int mEdgeSetFlag = 0;
@@ -100,6 +100,7 @@ public YogaNode(YogaConfig config) {
   }
 
   private native void jni_YGNodeFree(long nativePointer);
+  @Override
   protected void finalize() throws Throwable {
     try {
       jni_YGNodeFree(mNativePointer);
@@ -170,7 +171,8 @@ public YogaNode removeChildAt(int i) {
     return child;
   }
 
-  public @Nullable
+  @Nullable
+  public
   YogaNode getParent() {
     return mParent;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
index 85811c3b3b9b44..1b565ea1901bfe 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
@@ -16,7 +16,7 @@ public enum YogaNodeType {
   DEFAULT(0),
   TEXT(1);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaNodeType(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
index 2c02a8cff4933f..510f0af43f370f 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
@@ -17,7 +17,7 @@ public enum YogaOverflow {
   HIDDEN(1),
   SCROLL(2);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaOverflow(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
index 82fc7937c2adc8..bbaeba38f249b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
@@ -16,7 +16,7 @@ public enum YogaPositionType {
   RELATIVE(0),
   ABSOLUTE(1);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaPositionType(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
index 272eb2e2fd5ba0..58e2dc95e04783 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
@@ -17,7 +17,7 @@ public enum YogaPrintOptions {
   STYLE(2),
   CHILDREN(4);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaPrintOptions(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
index d8a10b361f25e2..8a08b0e5c39b6a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
@@ -18,7 +18,7 @@ public enum YogaUnit {
   PERCENT(2),
   AUTO(3);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaUnit(int intValue) {
     mIntValue = intValue;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
index 6b1dedccd79f0e..a19d3de3baff44 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
@@ -17,7 +17,7 @@ public enum YogaWrap {
   WRAP(1),
   WRAP_REVERSE(2);
 
-  private int mIntValue;
+  private final int mIntValue;
 
   YogaWrap(int intValue) {
     mIntValue = intValue;