remove unreachable

removed an unreachable line and simplified control flow.
Merge pull request #11 from shenanigans/master

remove unreachable code