Manual code review fixes for tools (code style)