Add Makefile for easier deployment
Some more indentation