Refactor into tools.mk