Improve Makefile using tips from #1