Touch of code cleanup