7.x 4.x coder cleanup

Coding style cleanup from the latest batch of pull requests.