small makefile improvement
clean benchmark code with macros
Draft code
Fix mergesort