Some cleanup in base :)