makefile tweaks
code cleanup