Cleaned and sped up makefile