Add some braces, and spaces around operators