Fixed redundent variable initialization and comment grammar