diff --git a/rpc_shutdown/CHANGELOG.md b/rpc_shutdown/CHANGELOG.md
index 1fac6c1..cc1836f 100644
--- a/rpc_shutdown/CHANGELOG.md
+++ b/rpc_shutdown/CHANGELOG.md
@@ -15,4 +15,5 @@
 - New option to send a message to the PC that is about to be shut down. If somebody is using the PC, you can warn them to save their work.
 
 ## 1.0
+
 - Update samba 4.8.8
diff --git a/rpc_shutdown/Dockerfile b/rpc_shutdown/Dockerfile
index 65ded60..6c3d1aa 100644
--- a/rpc_shutdown/Dockerfile
+++ b/rpc_shutdown/Dockerfile
@@ -8,6 +8,6 @@ ENV LANG C.UTF-8
 RUN apk add --no-cache samba-common-tools samba-common
 
 # Copy data
-COPY run.sh /
+COPY data/run.sh /
 
 CMD [ "/run.sh" ]
diff --git a/rpc_shutdown/README.md b/rpc_shutdown/README.md
index 5de041f..f095cd5 100644
--- a/rpc_shutdown/README.md
+++ b/rpc_shutdown/README.md
@@ -1,6 +1,6 @@
 # Hass.io Core Add-on: RPC Shutdown
 
-Simple way for remote windows shutdown.
+Shutdown Windows machines remotely.
 
 ![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] ![Supports i386 Architecture][i386-shield]
 
@@ -10,7 +10,7 @@ Allows you to shut down and Windows Computer with a service call from Home Assis
 
 ## Installation
 
-The installation of this add-on is straightforward and easy to do.
+Follow these steps to get the add-on installed on your system:
 
 1. Navigate in your Home Assistant frontend to **Hass.io** -> **Add-on Store**.
 2. Find the "RPC Shutdown" add-on and click it.
@@ -78,19 +78,18 @@ Show a custom message on the screen of the computer that will be shutdown.
 Use the following inside Home Assistant service call to use it:
 
 ```yaml
-service: hassio.addon_stdin 
+service: hassio.addon_stdin
 data:
-  addon: core_rpc_shutdown 
+  addon: core_rpc_shutdown
   input: test-pc
 ```
 
-- `service: hassio.addon_stdin`:
-  Use hassio.addon_stdin service to send data over STDIN to an add-on.
-- `data.addon: core_rpc_shutdown`:
-  Tells the service to send the command to this add-on.
-- `data.input: test-pc`:
-   Alias name created for the computer in the add-on configuration, and shuts that one down.
- 
+Each line explained:
+
+`service: hassio.addon_stdin`: Use hassio.addon_stdin service to send data over STDIN to an add-on.
+`data.addon: core_rpc_shutdown`: Tells the service to send the command to this add-on.
+`data.input: test-pc`: Alias name created for the computer in the add-on configuration, and shuts that one down.
+
 ## Support
 
 Got questions?
diff --git a/rpc_shutdown/azure-pipelines.yml b/rpc_shutdown/azure-pipelines.yml
index 0149d96..2bf4e44 100644
--- a/rpc_shutdown/azure-pipelines.yml
+++ b/rpc_shutdown/azure-pipelines.yml
@@ -3,20 +3,19 @@
 trigger:
   branches:
     include:
-    - master
+      - master
   paths:
     include:
-    - rpc_shutdown/*
+      - rpc_shutdown/*
 pr: none
 
 variables:
   - name: versionBuilder
-    value: '2.0'
+    value: "2.0"
   - group: docker
 
-
 jobs:
-- template: /.azure/azp-template-addon.yml
-  parameters:
-    addon: 'rpc_shutdown'
-    arch: '--all'
+  - template: /.azure/azp-template-addon.yml
+    parameters:
+      addon: "rpc_shutdown"
+      arch: "--all"
diff --git a/rpc_shutdown/config.json b/rpc_shutdown/config.json
index 7d5321c..95dc766 100644
--- a/rpc_shutdown/config.json
+++ b/rpc_shutdown/config.json
@@ -2,8 +2,8 @@
   "name": "RPC Shutdown",
   "version": "2.2",
   "slug": "rpc_shutdown",
-  "description": "Simple way for remote windows shutdowns",
-  "url": "https://home-assistant.io/addons/rpc_shutdown/",
+  "description": "Shutdown Windows machines remotely",
+  "url": "https://github.com/home-assistant/hassio-addons/tree/master/rpc_shutdown",
   "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
diff --git a/rpc_shutdown/run.sh b/rpc_shutdown/data/run.sh
similarity index 100%
rename from rpc_shutdown/run.sh
rename to rpc_shutdown/data/run.sh