tools: Minor nitpicking cleanup