Applied some JDeodrant refactoring.