More slight cleanup