Got rid of the temp spaces