Remove some white spaces