diff --git a/src/model/Stroke.cpp b/src/model/Stroke.cpp
index 9d2120f4..8b580f31 100644
--- a/src/model/Stroke.cpp
+++ b/src/model/Stroke.cpp
@@ -11,7 +11,8 @@
 using std::cout;
 using std::endl;
 
-Stroke::Stroke() : Element(ELEMENT_STROKE)
+Stroke::Stroke()
+ : Element(ELEMENT_STROKE)
 {
 	XOJ_INIT_TYPE(Stroke);
 
@@ -22,8 +23,7 @@ Stroke::Stroke() : Element(ELEMENT_STROKE)
 	this->points = NULL;
 	this->toolType = STROKE_TOOL_PEN;
 
-	this->audioFilename="";
-	this->timestamp=0;
+	this->timestamp = 0;
 
 	this->eraseable = NULL;
 }
diff --git a/src/model/Stroke.h b/src/model/Stroke.h
index 07f5de73..926bdfc6 100644
--- a/src/model/Stroke.h
+++ b/src/model/Stroke.h
@@ -100,9 +100,9 @@ private:
 	int pointCount;
 	int pointAllocCount;
 
-	//stroke timestamp
-	int timestamp=0;
-	string audioFilename="";
+	// Stroke timestamp, to match it to the audio stream
+	int timestamp;
+	string audioFilename;
 
 	EraseableStroke* eraseable;
 };
diff --git a/src/view/DocumentView.cpp b/src/view/DocumentView.cpp
index c65e88da..ea955e7a 100644
--- a/src/view/DocumentView.cpp
+++ b/src/view/DocumentView.cpp
@@ -98,7 +98,7 @@ void DocumentView::drawStroke(cairo_t* cr, Stroke* s, int startPoint, double sca
 	if (changeSource)
 	{
 		if (s->getToolType() == STROKE_TOOL_HIGHLIGHTER ||
-			s->getAudioFilename().length() == 0 && currentToolType == TOOL_PLAY_OBJECT )
+			(s->getAudioFilename().length() == 0 && currentToolType == TOOL_PLAY_OBJECT))
 		{
 			cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
 			// Set the color
@@ -392,7 +392,8 @@ void DocumentView::paintBackgroundGraph()
 {
 	XOJ_CHECK_TYPE(DocumentView);
 
-	applyColor(cr, 0xBDBDBD);	//maybe I should read settings like these from ini configs
+	// Original Xournal Color: applyColor(cr, 0x40A0FF);
+	applyColor(cr, 0xBDBDBD); // maybe I should read settings like these from ini configs
 
 	gdk_threads_enter();
 	cairo_set_line_width(cr, 0.5);