More formatting + added formatting tool in tools/