Style changes to conform more to Google style.