Minor fix. Refactoring.