Rework brackets

Potential solution to #54.