Fix code style and add tcp to the Makefile