[2800] Cleanup some white spaces