Minor changes - quotes.
Improved - Useless conditions removed.
Merge pull request #1 from Yousha/master

Updated/Improved.