Minor fix

Minor fix and cleanup