Updating code to current coding style in a some locations.