diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 01a7a2f6..f273c097 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -212,7 +212,7 @@ function shift_controller() {
   
   return [
       $shift['name'],
-      Shift_view($shift, $shifttype, $room, $angeltypes, $user_shifts, $shift_signup_state) 
+      Shift_view($shift, $shifttype, $room, $angeltypes, $shift_signup_state) 
   ];
 }
 
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index 629f6b2a..885d1ad9 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -28,7 +28,7 @@ function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null,
   return '';
 }
 
-function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts, ShiftSignupState $shift_signup_state) {
+function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupState $shift_signup_state) {
   global $privileges;
   
   $shift_admin = in_array('admin_shifts', $privileges);
diff --git a/public/js/shift-calendar.js b/public/js/shift-calendar.js
index 357b69ff..80072e58 100644
--- a/public/js/shift-calendar.js
+++ b/public/js/shift-calendar.js
@@ -3,12 +3,12 @@
  */
 $(document).ready(
     function() {
-      var time_lanes = $(".shift-calendar .time");
+      var timeLanes = $(".shift-calendar .time");
       var headers = $(".shift-calendar .header");
-      var top_reference = $(".container-fluid .row");
+      var topReference = $(".container-fluid .row");
       var top = headers.offset().top;
       var left = 15;
-      time_lanes.css({
+      timeLanes.css({
         "position" : "relative",
         "z-index" : 1000
       });
@@ -18,12 +18,12 @@ $(document).ready(
       });
       $(window).scroll(
           function() {
-            time_lanes.css({
+            timeLanes.css({
               "left" : Math.max(0, $(window).scrollLeft() - left) + "px"
             });
             headers.css({
               "top" : Math.max(0, $(window).scrollTop() - top
-                  + top_reference.offset().top)
+                  + topReference.offset().top)
                   + "px"
             });
           });