removed the if's
Merge pull request #1 from TheThirdOne/master

removed the if's