Small clean up, added clang support in Makefile