Slight cleanup of previous commit