[2900] Cleanup some white spaces