Code cleanup of the day!