Small format changes.
main renamed to toolInvoker