minor changes for space removal