reformatting Makefile and adding recipes