SW-98. Minor fixes and formatting.