Some minor cleaning up of code (to respect our coding style).