More code cleanup...