Added disk image to Makefile; code cleanup