Remove and add space