Some more code style updates
More code style updates, to suppress intentional code styles
The wonderful "white" hint