Make sure that we are using spaces everywhere.