Moved x = 0 into the parenthesis

Easier to understand
remove a whitepace
cleanup
Merge pull request #2463 from ziyangli:master