Style changes to accomodate code changes.