Clean-up, clean-up, everybody do your share...

Got rid of "if-else" nested branches and "switched" it with a switch-statement.
No more unneeded brackets and spaces
Used correct spacing and made everything generally more clean. :)