Remove a space
Reorganize