diff --git a/app/src/main/java/com/example/cameraxtestappjava/SegpassCameraActivity.java b/app/src/main/java/com/example/cameraxtestappjava/SegpassCameraActivity.java
index 5ca8e9f..a61650b 100644
--- a/app/src/main/java/com/example/cameraxtestappjava/SegpassCameraActivity.java
+++ b/app/src/main/java/com/example/cameraxtestappjava/SegpassCameraActivity.java
@@ -46,8 +46,8 @@ public class SegpassCameraActivity extends AppCompatActivity implements Activity
     }
 
     private void setCamera() {
-        cameraLayout = binding.sclCameraLayout;
-        cameraLayout.initSegpassCamera(this, this, this);
+        cameraLayout = binding.sclCameraLayout; // Bind SegpassCameraLayout to element in view
+        cameraLayout.initSegpassCamera(this, this, this); // Init SegpassCamera
     }
 
     @Override
diff --git a/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java b/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java
index 8018f30..b3216ee 100644
--- a/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java
+++ b/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java
@@ -55,10 +55,14 @@ public class SegpassCameraLayout extends FrameLayout {
         mActivity = activity;
         mPermissionListener = listener;
         mCameraCallback = cameraCallback;
+        setUpCamerae();
+        setUpListeners();
+    }
+
+    private void setUpCamerae() {
         mTextureView = rootView.findViewById(R.id.tvCameraTextureView);
         mCamera = new SegpassCamera(mActivity, mTextureView, mPermissionListener, mCameraCallback);
         mCamera.resumeCamera();
-        setUpListeners();
     }
 
     private void setUpListeners() {