Cleaned up braces