Minor modifs
Cleanup