Formatting, readability adjustments