Code cleanup and optimization

- Removed unused usings
- Converted if statements to switch (performance optimization)
Code cleanup and optimazation

See previous commit
Code improvments 3
Merge remote-tracking branch 'upstream/master'
Code improvments 4
Code improvements
Code improvements
Last code improvements :)
damn
Merge pull request #1 from Giswald/master

Code improvments from Giswald