cleaning up Makefile and Dockerfile