small cleanup changes