Removed twang.h from Makefile; Formatting