More concise + makefile