Minor fix, code cleanup