diff --git a/Makefile b/Makefile
index 5ce8014..60f5bf6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,15 @@
 image = miti.sh
+docker-run = docker run --rm -w /opt/app -v $(PWD):/opt/app $(image)
 
-run:
+serve:
 	docker run --rm -it --init -v $(PWD):/opt/app -p 8080:80 $(image) \
 		sh -c "openresty -p /opt/app -g 'daemon off;' -c conf/dev.nginx.conf"
 
 build:
-	docker run --rm -w /opt/app -v $(PWD):/opt/app $(image) sitegen
-
-build-code:
-	docker run --rm -w /opt/app -v $(PWD):/opt/app $(image) sitegen build code.md
+	$(if $(file), $(docker-run) sitegen build $(file), $(docker-run) sitegen)
 
 build-pygments:
-	docker run --rm -w /opt/app -v $(PWD):/opt/app $(image) moonc pygments.moon
+	$(docker-run) moonc pygments.moon
 
 image-rm:
 	docker image rm $(image)
@@ -20,7 +18,7 @@ image-build:
 	docker build -t $(image) .
 
 lint:
-	docker run --rm -w /opt/app -v $(PWD):/opt/app $(image) moonc -l .
+	$(docker-run) moonc -l .
 
 test:	build-pygments
 	./test.sh