Minor fix
Cleanup