Tiny improvement to Makefile and code