slight cleanup changes