Formatting, style improvements, etc.