Tweaking size
Clean up makefile