Remove whitespace
Fix version to 3.4
Remove unused code
Reduce if statement by returning out
Use one liner if statement
No reason to have a variable if it's only used once
Variable only used once again
Reduce if statements & one line if again
Merge pull request #1 from Geczy/master

Code changes