JAL-2890 added constructor that includes tool name & simplified others