some small cleanup