Refactoring. 
Guys... please open { after if and not in the next line. Remember Java
Coding style!