diff --git a/src/more-infos/more-info-alarm_control_panel.js b/src/more-infos/more-info-alarm_control_panel.js
index f183e4b2a0..80772b0279 100644
--- a/src/more-infos/more-info-alarm_control_panel.js
+++ b/src/more-infos/more-info-alarm_control_panel.js
@@ -1,19 +1,16 @@
 import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
-import attributeClassNames from '../util/attribute-class-names';
-
-const ATTRIBUTE_CLASSES = [];
 
 export default new Polymer({
   is: 'more-info-alarm_control_panel',
-  handleDisarmTap(number) {
+  handleDisarmTap() {
     this.callService('alarm_disarm', {code: this.entered_code});
   },
-  handleHomeTap(number) {
+  handleHomeTap() {
     this.callService('alarm_arm_home', {code: this.entered_code});
   },
-  handleAwayTap(number) {
+  handleAwayTap() {
     this.callService('alarm_arm_away', {code: this.entered_code});
   },
   properties: {
diff --git a/src/util/domain-icon.js b/src/util/domain-icon.js
index 920a3d0fe4..15b41095e3 100644
--- a/src/util/domain-icon.js
+++ b/src/util/domain-icon.js
@@ -11,13 +11,9 @@ export default function domainIcon(domain, state) {
 
   case 'switch':
     return 'image:flash-on';
-    
+
   case 'alarm_control_panel':
-    if (state && state === 'disarmed'){
-      return 'icons:lock-open';
-    }else{
-      return 'icons:lock';
-    }
+    return state && state === 'disarmed' ? 'icons:lock-open' : 'icons:lock';
 
   case 'media_player':
     let icon = 'hardware:cast';
diff --git a/src/util/state-more-info-type.js b/src/util/state-more-info-type.js
index 2cd99a323d..c8f43293be 100644
--- a/src/util/state-more-info-type.js
+++ b/src/util/state-more-info-type.js
@@ -1,6 +1,6 @@
 const DOMAINS_WITH_MORE_INFO = [
   'light', 'group', 'sun', 'configurator', 'thermostat', 'script',
-  'media_player', 'camera', 'updater', 'alarm_control_panel'
+  'media_player', 'camera', 'updater', 'alarm_control_panel',
 ];
 
 export default function stateMoreInfoType(state) {