diff --git a/appveyor.yml b/appveyor.yml
index 746c838..9542bea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,107 +1,81 @@
--
-  branches:
-    only:
-      - master
-      - /v.*/
+# AppVeyor config for https://github.com/inflatablefriends/lastfm
 
-  version: 1.1.999.{build}
+configuration: Release
 
-  image: Visual Studio 2017
+install:
+  - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
 
-  dotnet_csproj:
-    patch: true
-    file: '**\*.csproj'
-    version: '{version}'
-    package_version: '{version}'
-    assembly_version: '{version}'
-    file_version: '{version}'
-    informational_version: '{version}'
+before_build:
+  - ps: nuget restore IF.Lastfm.sln
 
-  configuration: Release
+build:
+  project: IF.Lastfm.sln
 
-  install:
-    - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
+test_script:
+  - ps: .\run-tests.ps1
 
-  before_build:
-    - ps: nuget restore IF.Lastfm.sln
+image: Visual Studio 2017
 
-  build:
-    project: IF.Lastfm.sln
+dotnet_csproj:
+  patch: true
+  file: '**\*.csproj'
+  version: '{version}'
+  package_version: '{version}'
+  assembly_version: '{version}'
+  file_version: '{version}'
+  informational_version: '{version}'
 
-  test_script:
-    - ps: .\run-tests.ps1
-
-  after_test:
-    - ps: pushd .nuget
-    - ps: .\pack.ps1 -versionSuffix prerelease
-    - ps: popd
-    - ps: cp .\.nuget\*.nupkg . 
-
-  artifacts:
-    - path: src\IF.Lastfm.Core\bin\Release\netstandard1.1\IF.Lastfm.Core.dll
-      name: IF.Lastfm.Core.dll
-    - path: src\IF.Lastfm.SQLite\bin\Release\netstandard1.1\IF.Lastfm.SQLite.dll
-      name: IF.Lastfm.SQLite.dll
-    - path: '\*-prerelease.nupkg'
-
-  notifications:
-    - provider: Webhook # ping Gitter ticker 
-      url: https://webhooks.gitter.im/e/aa615fb57d382a430815
+notifications:
+  - provider: Webhook # ping Gitter ticker 
+    url: https://webhooks.gitter.im/e/aa615fb57d382a430815
 
 #---------------------------------------------------------------
 
--
-  branches:
-    only:
-      - release
+for:
+  -
+    branches:
+      only:
+        - master
+        - /v.*/
 
-  # don't forget to update this!
-  version: 1.1.1.{build}
+    version: 1.1.999.{build}
+    
+    after_test:
+      - ps: pushd .nuget
+      - ps: .\pack.ps1 -versionSuffix prerelease
+      - ps: popd
+      - ps: cp .\.nuget\*.nupkg . 
 
-  image: Visual Studio 2017
+    artifacts:
+      - path: src\IF.Lastfm.Core\bin\Release\netstandard1.1\IF.Lastfm.Core.dll
+        name: IF.Lastfm.Core.dll
+      - path: src\IF.Lastfm.SQLite\bin\Release\netstandard1.1\IF.Lastfm.SQLite.dll
+        name: IF.Lastfm.SQLite.dll
+      - path: '\*-prerelease.nupkg'
 
-  dotnet_csproj:
-    patch: true
-    file: '**\*.csproj'
-    version: '{version}'
-    package_version: '{version}'
-    assembly_version: '{version}'
-    file_version: '{version}'
-    informational_version: '{version}'
+  -
+    branches:
+      only:
+        - release
 
-  configuration: Release
+    # don't forget to update this!
+    version: 1.1.1.{build}
+    
+    after_test:
+      - ps: pushd .nuget
+      - ps: .\pack.ps1
+      - ps: popd
+      - ps: cp .\.nuget\*.nupkg . 
 
-  install:
-    - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
+    artifacts:
+      - path: src\IF.Lastfm.Core\bin\Release\netstandard1.1\IF.Lastfm.Core.dll
+        name: IF.Lastfm.Core.dll
+      - path: src\IF.Lastfm.SQLite\bin\Release\netstandard1.1\IF.Lastfm.SQLite.dll
+        name: IF.Lastfm.SQLite.dll
+      - path: '\*.nupkg'
 
-  before_build:
-    - ps: nuget restore IF.Lastfm.sln
-
-  build:
-    project: IF.Lastfm.sln
-
-  test_script:
-    - ps: .\run-tests.ps1
-
-  after_test:
-    - ps: pushd .nuget
-    - ps: .\pack.ps1
-    - ps: popd
-    - ps: cp .\.nuget\*.nupkg . 
-
-  artifacts:
-    - path: src\IF.Lastfm.Core\bin\Release\netstandard1.1\IF.Lastfm.Core.dll
-      name: IF.Lastfm.Core.dll
-    - path: src\IF.Lastfm.SQLite\bin\Release\netstandard1.1\IF.Lastfm.SQLite.dll
-      name: IF.Lastfm.SQLite.dll
-    - path: '\*.nupkg'
-
-  deploy:
-    provider: NuGet
-    api_key:
-      secure: b4Q8KLmOfeQHZNGbTf4OYud3pvi3aR4rKE35dcLHYBTBaQwc9QeoIkDoG13Jpbxs
-    artifact: /.*\.nupkg/
-
-  notifications:
-    - provider: Webhook # ping Gitter ticker 
-      url: https://webhooks.gitter.im/e/aa615fb57d382a430815
+    deploy:
+      provider: NuGet
+      api_key:
+        secure: b4Q8KLmOfeQHZNGbTf4OYud3pvi3aR4rKE35dcLHYBTBaQwc9QeoIkDoG13Jpbxs
+      artifact: /.*\.nupkg/