Remove more curly braces