[c2803] Cleanup some white spaces

(based on commit 4aef0ea)