Cleaned makefile, and ensured it works with clang