In-line comments and typos