Better variable names, better makefile