Refactoring, try to follow the java standard.