Refactor attempt 1: Makefile