Update: simplify makefile