Corrected refactoring errors.