Delete spaces
Add some fix