Syntax adjustments
Comment adjustments