First coding style clean-up.