White noise: formatting and minor cleanup