Private tool fix/muon combined algs

Simple fix of private tools according to the convention.

The first commit is automatic style fixes using clang. The second one is ToolHandle fixes.