White noise: format and other minor fixes
[BASE-13] Provided hint applied, thanks
[BASE-13] Merge from master