Brackets

Improves indentation and straggler brackets