Code refactor with IDE

Code format improved by Netbeans IDE 8.0.1