Added cleanup, adapted from monsterwm
Updated Makefile