Refactoring

+ Some spaces, if, else if, else --> switch
+ Parenthesis in if to make it more clear
- Useless Javadoc