More code grooming.