Formatting, additional commenting