slight cleanup of previous