Remove unneeded else clauses
Merge pull request #125 from Shugyousha/simplereturn

Remove unneeded else clauses