Style changes. Minor fixes