removed if statements
removed whitspace and commented out code
Merge pull request #1 from obf73/remove_ifs

Remove ifs