Slight cleanup.