A bit more cleeanup