Formatting and quick fixes