Minor formatting, warning removals.