Minor fix & cleanup