Syntax and comment improvements