Add maps formatting
Update tools.mk