A bit clean up.