diff --git a/d2golf.hs b/d2golf.hs
index 00b25e4..82d01fc 100644
--- a/d2golf.hs
+++ b/d2golf.hs
@@ -1,3 +1,4 @@
-q(h:f:_)(d,n)|"f"<d=[h-n,f]|"f">d=[h+n,f]|let=[h,f+n]
-p[h,f,a](d,n)|"f"<d=[h,f,a-n]|"f">d=[h,f,a+n]|let=[h+n,f+n*a,a]
+q(h:f:_)(d,n)|"f"==d=[h,f+n]|let=[d%h$n,f]
+p[h,f,a](d,n)|"f"==d=[h+n,f+n*a,a]|let=[h,f,d%a$n]
+(%)d|"f"<d=(-)|let=(+)
 main=interact$show.(<$>[p,q]).((\(a:b:_)->a*b).).flip(`foldl`[0,0,0]).map(fmap read.splitAt 1.map head.words).lines
\ No newline at end of file