More code cleanup!