Split control statements onto separate lines and add braces