Re-factoring to reach simpler code

[imanghafoori1]

Simple re-factors to reach simpler code.

https://softwareengineering.stackexchange.com/questions/18454/should-i-return-from-a-function-early-or-use-an-if-statement

[imanghafoori1]

If you like I can participate in code refactoring more.

[gdbhosale]

@imanghafoori1 Have you tested this code ?

[imanghafoori1]

@gdbhosale Sure it works as before... You also can test your self.