Updating: Makefile simplification