Cleaned up braces matcher