useless if/else.
Merge pull request #1 from tarrsalah/master

Useless if/else.