Change the code in according with the code convention for the java