diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
index 624bc5f..ed4db61 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
@@ -305,7 +305,6 @@ public class WeekView extends View {
 
         @Override
         public boolean onDoubleTap(MotionEvent e){
-            log.d("onDoubleTapEvent");
             Calendar selectedTime = getTimeFromPoint(e.getX(), e.getY());
             if (selectedTime != null && mDoubleTapListener != null) {
                 mDoubleTapListener.mOnDoubleTapListener((Calendar) selectedTime.clone());
@@ -315,7 +314,6 @@ public class WeekView extends View {
 
         @Override
         public boolean onSingleTapConfirmed(MotionEvent e) {
-            log.d("onSingleTapConfirmed");
             // If the tap was on an event then trigger the callback.
             if (mEventRects != null && mEventClickListener != null) {
                 List<EventRect> reversedEventRects = mEventRects;
@@ -1081,15 +1079,16 @@ public class WeekView extends View {
     private void drawEvents(Calendar date, float startFromPixel, Canvas canvas) {
         if (mEventRects != null && mEventRects.size() > 0) {
             for (int i = 0; i < mEventRects.size(); i++) {
-                if (isSameDay(mEventRects.get(i).event.getStartTime(), date) && !mEventRects.get(i).event.isAllDay()) {
-                    float top = mHourHeight * mEventRects.get(i).top / 60 + getEventsTop();
-                    float bottom = mHourHeight * mEventRects.get(i).bottom / 60 + getEventsTop();
+                EventRect eventRect = mEventRects.get(i);
+                if (isSameDay(eventRect.event.getStartTime(), date) && !eventRect.event.isAllDay()) {
+                    float top = mHourHeight * eventRect.top / 60 + getEventsTop();
+                    float bottom = mHourHeight * eventRect.bottom / 60 + getEventsTop();
 
                     // Calculate left and right.
-                    float left = startFromPixel + mEventRects.get(i).left * mWidthPerDay;
+                    float left = startFromPixel + eventRect.left * mWidthPerDay;
                     if (left < startFromPixel)
                         left += mOverlappingEventGap;
-                    float right = left + mEventRects.get(i).width * mWidthPerDay;
+                    float right = left + eventRect.width * mWidthPerDay;
                     if (right < startFromPixel + mWidthPerDay)
                         right -= mOverlappingEventGap;
 
@@ -1100,24 +1099,24 @@ public class WeekView extends View {
                             right > mHeaderColumnWidth &&
                             bottom > mHeaderHeight + mHeaderRowPadding * 2 + mTimeTextHeight / 2 + mHeaderMarginBottom
                             ) {
-                        mEventRects.get(i).rectF = new RectF(left, top, right, bottom);
-                        if (mEventRects.get(i).event.getColor() != null)
-                            mEventRects.get(i).event.getColor().setPaintColor(mEventBackgroundPaint);
+                        eventRect.rectF = new RectF(left, top, right, bottom);
+                        if (eventRect.event.getColor() != null)
+                            eventRect.event.getColor().setPaintColor(mEventBackgroundPaint);
                         else
                             mEventBackgroundPaint.setColor(mDefaultEventColor);
-                        mEventBackgroundPaint.setShader(mEventRects.get(i).event.getShader());
-                        canvas.drawRoundRect(mEventRects.get(i).rectF, mEventCornerRadius, mEventCornerRadius, mEventBackgroundPaint);
+                        mEventBackgroundPaint.setShader(eventRect.event.getShader());
+                        canvas.drawRoundRect(eventRect.rectF, mEventCornerRadius, mEventCornerRadius, mEventBackgroundPaint);
                         float topToUse = top;
-                        if (mEventRects.get(i).event.getStartTime().get(Calendar.HOUR_OF_DAY) < mMinTime)
+                        if (eventRect.event.getStartTime().get(Calendar.HOUR_OF_DAY) < mMinTime)
                             topToUse = mHourHeight * getPassedMinutesInDay(mMinTime, 0) / 60 + getEventsTop();
 
-                        if (!mNewEventIdentifier.equals(mEventRects.get(i).event.getIdentifier()))
-                            drawEventTitle(mEventRects.get(i).event, mEventRects.get(i).rectF, canvas, topToUse, left);
+                        if (!mNewEventIdentifier.equals(eventRect.event.getIdentifier()))
+                            drawEventTitle(eventRect.event, eventRect.rectF, canvas, topToUse, left);
                         else
-                            drawEmptyImage(mEventRects.get(i).event, mEventRects.get(i).rectF, canvas, topToUse, left);
+                            drawEmptyImage(eventRect.event, eventRect.rectF, canvas, topToUse, left);
 
                     } else
-                        mEventRects.get(i).rectF = null;
+                        eventRect.rectF = null;
                 }
             }
         }