Minor syntax and comments improvements