Formatting, minor additions