More clean up.

Update Makefile. Format code with AStyle,