Remove a useless `else`.
Rename a variable and fix CS.
Remove unnecessary else and elseif with return.
Merge pull request #24 from Hywan/cs

Various CS