Minor fix and cleanup