Close Bracket Feature.
[closebrackets addon] Clean up and integrate