Fix whitespace

Part of #965