Update commandline tool. Small cleanup.