Remove a useless line.
Fix CS.
Merge pull request #18 from Hywan/cs

Some coding style update