Minor changes to ignorable, slight cleanup