diff --git a/tinyproxy/files/tinyproxy.conf b/tinyproxy/files/tinyproxy.conf
index 0790c05..61dd064 100644
--- a/tinyproxy/files/tinyproxy.conf
+++ b/tinyproxy/files/tinyproxy.conf
@@ -1,7 +1,6 @@
-{%- if pillar.tinyproxy is defined %}
-{%- from "tinyproxy/map.jinja" import service with context %}
-{%- endif %}
-
+{%- if pillar.tinyproxy is defined -%}
+{%- from "tinyproxy/map.jinja" import service with context -%}
+{%- endif -%}
 User {{ service.get('user', 'nobody') }}
 Group {{ service.get('group', 'nogroup') }}
 Port {{ service.get('port', '8888') }}
diff --git a/tinyproxy/service.sls b/tinyproxy/service.sls
index 850ccbe..6c6c7a6 100644
--- a/tinyproxy/service.sls
+++ b/tinyproxy/service.sls
@@ -6,7 +6,7 @@
 
 tinyproxy_config:
   file.managed:
-  - name: /etc/tinyproxy/tinyproxy.conf
+  - name: /etc/tinyproxy.conf
   - source: salt://tinyproxy/files/tinyproxy.conf
   - template: jinja
   - user: root