Code formatting (curly braces) and extra constructor for Container