Small improvements for tools

A few small clean up tasks for tools