Fixed redundent variable initialization and comment grammar
Merge branch 'master' of https://github.com/ztratar/trunk8