Slight cleanup, goodnight