Leonardo Makefile entry and some cosmetics on the code