Remove if's
Reduce complex of method
Merge pull request #16 from Ashrey/master

Remove if's