diff --git a/server/api/flukso/src/flukso.hrl b/server/api/flukso/src/flukso.hrl
index f196fb8..02c08b8 100644
--- a/server/api/flukso/src/flukso.hrl
+++ b/server/api/flukso/src/flukso.hrl
@@ -16,6 +16,9 @@
 %%%
 %% @doc Common record definitions and helper functions for the Flukso API. 
 
+-define(BASE_PATH, "var/data/base/").
+-define(NIGHT_PATH, "var/data/night/").
+
 -define(MINUTE,     60).
 -define(QUARTER,   900).
 -define(HOUR,     3600).
diff --git a/server/api/flukso/src/flukso_sensor_xyz.erl b/server/api/flukso/src/flukso_sensor_xyz.erl
index c806712..776aa65 100644
--- a/server/api/flukso/src/flukso_sensor_xyz.erl
+++ b/server/api/flukso/src/flukso_sensor_xyz.erl
@@ -115,8 +115,8 @@ content_types_provided(ReqData, State) ->
 
 to_json(ReqData, #state{rrdSensor = RrdSensor, rrdStart = RrdStart, rrdEnd = RrdEnd, rrdResolution = RrdResolution, rrdFactor = RrdFactor, jsonpCallback = JsonpCallback} = State) -> 
     case wrq:get_qs_value("interval", ReqData) of
-        "night"   -> Path = "var/data/night/";
-        _Interval -> Path = "var/data/base/"
+        "night"   -> Path = NIGHT_PATH;
+        _Interval -> Path = BASE_PATH
     end,
 
 %% debugging: io:format("~s~n", [erlrrd:c([[Path, [RrdSensor|".rrd"]], "AVERAGE", ["-s ", RrdStart], ["-e ", RrdEnd], ["-r ", RrdResolution]])]),
@@ -140,15 +140,13 @@ to_json(ReqData, #state{rrdSensor = RrdSensor, rrdStart = RrdStart, rrdEnd = Rrd
 % JSON: {"measurements":[[<TS1>,<VALUE1>],...,[<TSn>,<VALUEn>]]}
 % Mochijson2: {struct,[{<<"measurements">>,[[<TS1>,<VALUE1>],...,[<TSn>,<VALUEn>]]}]}
 process_post(ReqData, #state{rrdSensor = RrdSensor} = State) ->
-    Path = "var/data/base/",
-
     {struct, JsonData} = mochijson2:decode(wrq:req_body(ReqData)),
     Measurements = proplists:get_value(<<"measurements">>, JsonData),
     RrdData = [[integer_to_list(Time), ":", integer_to_list(Counter), " "] || [Time, Counter] <- Measurements],
 
 %debugging: io:format("~s~n", [[Path, [RrdSensor|".rrd"], " ", RrdData]]),
     
-    case erlrrd:update([Path, [RrdSensor|".rrd"], " ", RrdData]) of
+    case erlrrd:update([BASE_PATH, [RrdSensor|".rrd"], " ", RrdData]) of
         {ok, _RrdResponse} -> RrdResponse = "ok";
         {error, RrdResponse} -> true
     end,