Formatting changes, code enclosure