few small cleanup things!