Streamlined code (no changes in functionality or bug fixes)
Makefile updates