Explicit constructors
Control flow/braces fixes