Start conforming code to "git subcmd" style part 3