Removing some more braces