a bit clean up