diff --git a/core/include/aare/Frame.hpp b/core/include/aare/Frame.hpp
index 78f5d47..e33563f 100644
--- a/core/include/aare/Frame.hpp
+++ b/core/include/aare/Frame.hpp
@@ -18,13 +18,8 @@ template <class DataType> class Frame {
     DataType *m_data;
     ssize_t m_bitdepth = sizeof(DataType) * 8;
 
-    public:
-    ssize_t rows;
-    ssize_t cols;
-    DataType* data;
-    ssize_t bitdepth = sizeof(DataType)*8;
+  public:
     Frame(ssize_t rows, ssize_t cols);
-
     Frame(std::byte *fp, ssize_t rows, ssize_t cols);
     DataType get(int row, int col);
     ssize_t rows() const{
@@ -36,6 +31,9 @@ template <class DataType> class Frame {
     ssize_t bitdepth() const{
         return m_bitdepth;
     }
+    DataType* _get_data(){
+        return m_data;
+    }
 
     ~Frame() { delete[] m_data; }
 };
diff --git a/core/src/Frame.cpp b/core/src/Frame.cpp
index 575e25d..28d72b7 100644
--- a/core/src/Frame.cpp
+++ b/core/src/Frame.cpp
@@ -10,8 +10,8 @@ Frame<DataType>::Frame(std::byte* bytes, ssize_t rows, ssize_t cols):
 
 template <typename DataType>
 Frame<DataType>::Frame(ssize_t rows, ssize_t cols):
-  rows(rows), cols(cols) {
-    data = new DataType[rows*cols];
+  m_rows(rows), m_cols(cols) {
+    m_data = new DataType[m_rows*m_cols];
   }
 
 
diff --git a/file_io/src/NumpyFile.cpp b/file_io/src/NumpyFile.cpp
index 78de3d8..245942e 100644
--- a/file_io/src/NumpyFile.cpp
+++ b/file_io/src/NumpyFile.cpp
@@ -17,7 +17,7 @@ Frame<DataType> *NumpyFile<detector, DataType>::get_frame(int frame_number) {
     }
     Frame<DataType> *frame = new Frame<DataType>(header.shape[1], header.shape[2]);
     fseek(fp, header_size + frame_number * bytes_per_frame(), SEEK_SET);
-    fread(frame->data, sizeof(DataType), pixels_per_frame(), fp);
+    fread(frame->_get_data(), sizeof(DataType), pixels_per_frame(), fp);
     return frame;
 }
 
diff --git a/file_io/src/NumpyFileFactory.cpp b/file_io/src/NumpyFileFactory.cpp
index fd15970..0f90a7d 100644
--- a/file_io/src/NumpyFileFactory.cpp
+++ b/file_io/src/NumpyFileFactory.cpp
@@ -2,7 +2,7 @@
 
 template <DetectorType detector, typename DataType>
 NumpyFileFactory<detector, DataType>::NumpyFileFactory(std::filesystem::path fpath) {
-    this->fpath = fpath;
+    this->m_fpath = fpath;
 }
 inline std::string parse_str(const std::string &in) {
     if ((in.front() == '\'') && (in.back() == '\''))
@@ -213,7 +213,7 @@ void NumpyFileFactory<detector, DataType>::parse_metadata(File<detector, DataTyp
 
 template <DetectorType detector, typename DataType>
  File<detector, DataType>* NumpyFileFactory<detector, DataType>::load_file() {
-    NumpyFile<detector, DataType> *file = new NumpyFile<detector, DataType>(this->fpath);
+    NumpyFile<detector, DataType> *file = new NumpyFile<detector, DataType>(this->m_fpath);
     parse_metadata(file);
     NumpyFile<detector, DataType> *f = dynamic_cast<NumpyFile<detector, DataType> *>(file);
     std::cout << "parsed header: " << f->header.to_string() << std::endl;