diff --git a/modules/metrics/src/main/java/org/springside/modules/metrics/Counter.java b/modules/metrics/src/main/java/org/springside/modules/metrics/Counter.java
index a8e5245e..6aaca8a1 100644
--- a/modules/metrics/src/main/java/org/springside/modules/metrics/Counter.java
+++ b/modules/metrics/src/main/java/org/springside/modules/metrics/Counter.java
@@ -32,23 +32,22 @@ public class Counter {
 		counter.addAndGet(-n);
 	}
 
-	public CounterMetric calculateMetric() {
+    public CounterMetric calculateMetric() {
+        long lastCount = counter.getAndSet(0);
+        long currentTime = clock.getCurrentTime();
 
-		long currentCount = counter.getAndSet(0);
-		long currentTime = clock.getCurrentTime();
+        CounterMetric metric = new CounterMetric();
 
-		CounterMetric metric = new CounterMetric();
+        totalCount += lastCount;
+        metric.lastCount = lastCount;
+        metric.totalCount = totalCount;
 
-		totalCount += currentCount;
-		metric.lastCount = currentCount;
-		metric.totalCount = totalCount;
+        long elapsed = currentTime - lastReportTime;
+        if (elapsed > 0) {
+            metric.lastRate = (lastCount * 1000) / elapsed;
+        }
 
-		long timePass = currentTime - lastReportTime;
-		if (timePass > 0) {
-			metric.lastRate = (currentCount * 1000) / timePass;
-		}
-
-		lastReportTime = currentTime;
-		return metric;
-	}
+        lastReportTime = currentTime;
+        return metric;
+    }
 }
diff --git a/modules/metrics/src/main/java/org/springside/modules/metrics/report/GraphiteReporter.java b/modules/metrics/src/main/java/org/springside/modules/metrics/report/GraphiteReporter.java
index 4b94a9b4..0c7ec652 100644
--- a/modules/metrics/src/main/java/org/springside/modules/metrics/report/GraphiteReporter.java
+++ b/modules/metrics/src/main/java/org/springside/modules/metrics/report/GraphiteReporter.java
@@ -117,7 +117,7 @@ public class GraphiteReporter implements Reporter {
 			writer.write(' ');
 			writer.write(sanitize(value));
 			writer.write(' ');
-			writer.write(Long.toString(timestamp));
+			writer.write(format(timestamp));
 			writer.write('\n');
 		} catch (IOException e) {
 			throw e;