Makefile and src cleanup.