Reorganized makefile and cleaned up output