some small cleanup tweaks