Makefile improvements.
Code clean-up.