Minor fix, cleaning code