Removed redundant if-constructions and unnecessary variable declaration.

Comment From: mikaelparsekyan

I did the changes.

Comment From: sbrannen

This has been merged into master.

Thanks

Comment From: mikaelparsekyan

I am glad I helped.