some if else tab's clean up
Merge pull request #2 from Mafarricos/master

some if else tab's clean up