Minor: add default to properties, indentation, exceptions