Refactoring; Minor fix.