Simple fix of private tools. The first commit is just style fixes. The second one contains all important changes.