datapath: Cleanup tab/space issues in datapath