A bit clean up