Replaced parenthesis with curly brackets in some places