Adds variables to Makefile, renames clear to clean