Fixes #5364: Clean up tools source to use a double-space indentation con...

...vention - implementation