diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h
index 118acd817cd6..8bddde3a569c 100644
--- a/polly/include/polly/ScopInfo.h
+++ b/polly/include/polly/ScopInfo.h
@@ -95,7 +95,7 @@ private:
   std::string BaseName;
   isl_basic_map *createBasicAccessMap(ScopStmt *Statement);
   void setBaseName();
-  ScopStmt *statement;
+  ScopStmt *Statement;
 
   const Instruction *Inst;
 
@@ -173,7 +173,7 @@ public:
   bool isStrideZero(__isl_take const isl_map *Schedule) const;
 
   /// @brief Get the statement that contains this memory access.
-  ScopStmt *getStatement() const { return statement; }
+  ScopStmt *getStatement() const { return Statement; }
 
   /// @brief Set the updated access relation read from JSCOP file.
   void setNewAccessRelation(isl_map *newAccessRelation);
diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index 245d68311efc..9c652f8f064d 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -318,9 +318,7 @@ isl_basic_map *MemoryAccess::createBasicAccessMap(ScopStmt *Statement) {
 
 MemoryAccess::MemoryAccess(const IRAccess &Access, const Instruction *AccInst,
                            ScopStmt *Statement)
-    : Inst(AccInst) {
-  newAccessRelation = NULL;
-  statement = Statement;
+    : Statement(Statement), Inst(AccInst), newAccessRelation(NULL) {
 
   BaseAddr = Access.getBase();
   setBaseName();
@@ -377,15 +375,13 @@ MemoryAccess::MemoryAccess(const IRAccess &Access, const Instruction *AccInst,
 }
 
 void MemoryAccess::realignParams() {
-  isl_space *ParamSpace = statement->getParent()->getParamSpace();
+  isl_space *ParamSpace = Statement->getParent()->getParamSpace();
   AccessRelation = isl_map_align_params(AccessRelation, ParamSpace);
 }
 
-MemoryAccess::MemoryAccess(const Value *BaseAddress, ScopStmt *Statement) {
-  newAccessRelation = NULL;
-  BaseAddr = BaseAddress;
-  Type = READ;
-  statement = Statement;
+MemoryAccess::MemoryAccess(const Value *BaseAddress, ScopStmt *Statement)
+    : Type(READ), BaseAddr(BaseAddress), Statement(Statement),
+      newAccessRelation(nullptr) {
 
   isl_basic_map *BasicAccessMap = createBasicAccessMap(Statement);
   AccessRelation = isl_map_from_basic_map(BasicAccessMap);