Fixing some white spaces