Removed dodgey braces